summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-10-06 12:48:57 +0100
committerMark Brown <broonie@kernel.org>2014-10-06 12:48:57 +0100
commit565fefdf31a58b5c07869fe598c3dcc69ed680d7 (patch)
treee3bbbb0740a16fbabfc6eb0de8ba4b390b7ee9a4 /sound
parent9919badff1ae85ecb273491b9f8adff0bb47b0e7 (diff)
parentf114ce605daa1fb9d4efa253ea6d5bd4802902af (diff)
parent8a36eaa2ff4a9452a78d799503b920b4e1a0ec31 (diff)
parent5d5e63af998026f0340d1081fb15ad3c26d80c81 (diff)
parent8d01370f59856a0ac5b222878667d52477b589f0 (diff)
parentc05a11f7b8b5bc67f2c9f726c52b59f67b1bfe7d (diff)
Merge remote-tracking branches 'asoc/topic/davinci', 'asoc/topic/dmic', 'asoc/topic/drivers', 'asoc/topic/es8328' and 'asoc/topic/fsl' into asoc-next