Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:16 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:16 +0000 (17:20 +0100)
commit70fe99d8dbbcff8b61b613e738e9d133ed2d2b15
treeae5c0095908c5f68d912268d97d4e962f2ab1283
parent87fd83fd3ca933dbb5bd97226c1890c7b4659c72
parentcf1f7c6e8756646db7a0d883013cedd90eb90dd4
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
include/sound/soc-dapm.h
sound/soc/soc-dapm.c
sound/soc/soc-pcm.c