git.maquefel.me Git - linux.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	8db0d35bee8c7ea32591f33bf5aa97df454b3f6d
tree	202ff8185e6aa7fbb7993d1c9b417c04b7d3234b	tree \| snapshot
parent	d433570d9cac9c98de4c71b38d47b759f9168dea	commit \| diff
parent	cc1bc54aa787c39125fe843e81bd693e8f507c32	commit \| diff

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

Conflicts:
sound/soc/fsl/Kconfig

ep93xx device tree rework repo: git://git.maquefel.me/linux.git