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)
commit8db0d35bee8c7ea32591f33bf5aa97df454b3f6d
tree202ff8185e6aa7fbb7993d1c9b417c04b7d3234b
parentd433570d9cac9c98de4c71b38d47b759f9168dea
parentcc1bc54aa787c39125fe843e81bd693e8f507c32
Merge branch 'topic/tlv320aic23' of git://git./linux/kernel/git/broonie/sound into asoc-fsl

Conflicts:
sound/soc/fsl/Kconfig
sound/soc/fsl/Kconfig