Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai
authorMark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)
committerMark Brown <broonie@linaro.org>
Thu, 16 Jan 2014 12:42:53 +0000 (12:42 +0000)
commit99896f714a0a940d84476bc6208319f70af30789
tree89002aa02e1308caf0c6a9d99fb5a722aee750e0
parenta9b68d3b90988dd13c668d6b1d45cdca1557f070
parentf7d3c17096f6cbca8f0113d5a092ffcc72c7bf41
Merge remote-tracking branch 'asoc/topic/dapm' into for-tiwai
include/sound/soc-dai.h
include/sound/soc-dapm.h
sound/soc/soc-core.c
sound/soc/soc-utils.c