Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next
authorMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:43 +0000 (14:28 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 22 Aug 2013 13:28:43 +0000 (14:28 +0100)
commitc8a538417e2b6f0a68127cdcbbd0790b3bd250cf
treefb882334f89dfe2b7f2e05f3d6e2aab31433804d
parent97473630c78e687deb59284b19d09a095d38bc36
parent6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2
Merge remote-tracking branch 'asoc/topic/new-pcm' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile