Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm
authorMark Brown <broonie@linaro.org>
Mon, 5 Aug 2013 17:12:39 +0000 (18:12 +0100)
committerMark Brown <broonie@linaro.org>
Mon, 5 Aug 2013 17:12:39 +0000 (18:12 +0100)
commit6c3137fd01038972bf2ffe1e6fc4bb51b26e51f2
tree92a6b7232a02ed69b86219e8f125e08bf95f3837
parent13b02fa0dbb1311d08dfacd897a6ff41232d7cfb
parent95169d080fcaad6c990ce3602d9b3d38753b1fa4
Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-new-pcm

Trivial add/add conflicts:
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile