Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@linaro.org>
Fri, 7 Mar 2014 03:05:07 +0000 (11:05 +0800)
committerMark Brown <broonie@linaro.org>
Fri, 7 Mar 2014 03:05:07 +0000 (11:05 +0800)
Conflicts:
sound/soc/fsl/Kconfig


Trivial merge