Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc...
authorMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:22:15 +0000 (21:22 +0000)
committerMark Brown <broonie@linaro.org>
Tue, 25 Mar 2014 21:22:15 +0000 (21:22 +0000)
commitc159a85013afbb8283f0c7272812952e04d5c3a1
tree06e05c4c121abce92f5759eaa7d9baa87a25d496
parentbad318cd02e7cacb8e93608f050fa001830ad224
parent5f9e6ff66f49d4d791af2b7c9d20727fb8a688e8
parent1ca2e8474df3626f8d64d23420f8bd16bcef2448
Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next
sound/soc/soc-core.c
sound/soc/tegra/tegra20_ac97.c