diff options
author | Mark Brown <broonie@linaro.org> | 2014-03-23 15:00:55 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-23 15:00:55 +0100 |
commit | 980aac20877e428406959391e6cb6b8dc3243ad2 (patch) | |
tree | 47c62f3fb21281585905da76189f56e874d390fc | |
parent | Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/io' and 'asoc/... (diff) | |
parent | ASoC: max98090: Remove unused control_data field (diff) | |
parent | ASoC: omap-abe-twl6040: Register machine level DMIC DAPM routes with the card (diff) | |
download | linux-980aac20877e428406959391e6cb6b8dc3243ad2.tar.xz linux-980aac20877e428406959391e6cb6b8dc3243ad2.zip |
Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' into asoc-next