git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	Mark Brown <broonie@linaro.org>
	Fri, 7 Mar 2014 03:05:07 +0000 (11:05 +0800)
committer	Mark Brown <broonie@linaro.org>
	Fri, 7 Mar 2014 03:05:07 +0000 (11:05 +0800)
commit	0bf0d4333613f0bebf4849337630d576d46c9810
tree	202ff8185e6aa7fbb7993d1c9b417c04b7d3234b	tree \| snapshot
parent	6837f131dc3d6f37b1f6048904713b3f3d209efb	commit \| diff
parent	354c41f836e8ce4a076ef8e48c32b6c8fe7f53c8	commit \| diff

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

Conflicts:
sound/soc/fsl/Kconfig

Linux Kernel Source Tree.