summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:49:03 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:49:03 +0100
commit7370780cfd52552e570e4d252c75584c36378e4e (patch)
treeb459970faa72c04be9c6c2ee3fa42b9b0840b417 /sound
parent9568eaec6c16f909e806a3920699376ec147d8fa (diff)
parentf3fa1bbd836a7d6efb2abd506ed8e24096f39062 (diff)
parent6f67c380056ceaf5844f18d3a5d769d233247849 (diff)
parente8a70c25b809367fc314743e1ba1dbf0159398a7 (diff)
parent6f4d2b3177ee3352e70c90f327e2dea3809c263e (diff)
parent5d0ecb0e7dd53e61e034bac8508d7601b04e679d (diff)
Merge remote-tracking branches 'asoc/topic/rt5645', 'asoc/topic/rt5677', 'asoc/topic/samsung', 'asoc/topic/sgtl5000' and 'asoc/topic/sh' into asoc-next