Merge remote-tracking branch 'asoc/topic/component' into asoc-multi
authorMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
committerMark Brown <broonie@linaro.org>
Wed, 16 Jul 2014 21:58:45 +0000 (22:58 +0100)
commitf7acb3694a999fdf04dc3096e8416a0bfdabd590
tree8e796f5a1d7d4b2c4398c0577174d0e9f77be3c7
parentc8dd1fec47d0b1875f292c40bed381b343e38b40
parent5f3484ac8775a183f855fd213907c4221d2fb11f
Merge remote-tracking branch 'asoc/topic/component' into asoc-multi
sound/soc/soc-core.c
sound/soc/soc-pcm.c