summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-27 19:04:41 +0000
committerMark Brown <broonie@kernel.org>2014-11-27 19:04:41 +0000
commitb5ce244532c73b62db0201e0df0dba3ee34243fe (patch)
tree9f3af034352b6c06e8ecfe634f58a4d26ab56ea0 /sound
parent9c3e49bca538d845819fa169ba6a0e18ed31feee (diff)
parent6a6dec83e5abbc5003dac234970b51afa142defd (diff)
parent7e35ac81598c9a98dee4faa77b988c4ea919d1cd (diff)
parent69434097916bc52a4d6d495a0d719eb02e0cff9e (diff)
parent525b8634d8dee0e3a8409a73ef5f22ac8676a8c4 (diff)
Merge remote-tracking branches 'asoc/topic/fsl-dt', 'asoc/topic/fsl-ssi', 'asoc/topic/hdmi' and 'asoc/topic/intel' into asoc-next