Merge remote-tracking branch 'asoc/topic/cs42xx8' into asoc-next
authorMark Brown <broonie@linaro.org>
Sun, 23 Mar 2014 14:00:48 +0000 (14:00 +0000)
committerMark Brown <broonie@linaro.org>
Sun, 23 Mar 2014 14:00:48 +0000 (14:00 +0000)
commitb4d032b3fbe444c7978eb5aeda5d24164a9e8c2e
tree740a8899f25e30a7de053f5cc53cb908f78fa088
parentf928badf5e58195af2ae3a457da35190d10ace48
parent0c516b4ff85c0be4cee5b30ae59c9565c7f91a00
Merge remote-tracking branch 'asoc/topic/cs42xx8' into asoc-next
sound/soc/codecs/Kconfig
sound/soc/codecs/Makefile