summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-23 15:00:55 +0100
committerMark Brown <broonie@linaro.org>2014-03-23 15:00:55 +0100
commit980aac20877e428406959391e6cb6b8dc3243ad2 (patch)
tree47c62f3fb21281585905da76189f56e874d390fc /sound
parentMerge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/io' and 'asoc/... (diff)
parentASoC: max98090: Remove unused control_data field (diff)
parentASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the card (diff)
downloadlinux-980aac20877e428406959391e6cb6b8dc3243ad2.tar.xz
linux-980aac20877e428406959391e6cb6b8dc3243ad2.zip
Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc-next