git.stricted.de - GitHub/LineageOS/android_kernel_motorola

author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 17 Jan 2010 16:47:32 +0000 (16:47 +0000)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Sun, 17 Jan 2010 16:47:32 +0000 (16:47 +0000)
commit	9135f6db09aa9d186f05d41e9c516ec8e3550d78
tree	5deebbc7e9dd74a000f649e51d17e3f07c20b138	tree \| snapshot (tar.gz zip)
parent	a421296840379aee7d00ec4a28ecfe7e697a0a44	commit \| diff
parent	b05f5c13d5bc2fa9945c9534f8881396555290a9	commit \| diff

Merge branch 'mxc-audio' into for-2.6.34

Conflicts:
arch/arm/plat-mxc/Makefile (dual add)
sound/soc/imx/mx27vis_wm8974.c (API updates & removal)