Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:21 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:21 +0000 (17:20 +0100)
1  2 
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile

Simple merge
Simple merge