Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
authorMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:25 +0000 (17:20 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 17 Jun 2013 16:20:25 +0000 (17:20 +0100)
commit60790c5735c78e2576fcb1e2fa47f5f11464445a
tree22dfa9d3bd7a0f5a1f8c808e14b2da04d5794dc7
parent3843e87ebd2f3304df5f75bb34b0ee207d3b4356
parent9be94aeabf551aa5e2481ab9d626ba82d6b14f3d
Merge remote-tracking branch 'asoc/topic/rt5640' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile