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)
commit18923d7ec799d53fe1a26ac67586dcd0ed59ac15
tree9f2ca750046cfe999bbcc8a8f0379a2bfffa1cd9
parent0d664db6221e7f9f5649c3041f98adde00de2d97
parentbf7c6e6ccbde22c96c5c1e5cec08740c31229df1
Merge remote-tracking branch 'asoc/topic/hdmi' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile