From: Mark Brown <broonie@linaro.org>
Date: Fri, 7 Mar 2014 03:05:07 +0000 (+0800)
Subject: Merge branch 'topic/tlv320aic23' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.15-rc1~36^2~1^2~5^2~6^6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8db0d35bee8c7ea32591f33bf5aa97df454b3f6d;p=pandora-kernel.git

Merge branch 'topic/tlv320aic23' of git://git./linux/kernel/git/broonie/sound into asoc-fsl

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

8db0d35bee8c7ea32591f33bf5aa97df454b3f6d
Reading git-diff-tree failed