Merge commit 'v2.6.39-rc3' into for-2.6.39

author Mark Brown <broonie@opensource.wolfsonmicro.com>

Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)

committer Mark Brown <broonie@opensource.wolfsonmicro.com>

Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)
author Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)
committer Mark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/codecs/sn95031.c
Simple merge
diff --cc sound/soc/codecs/wm8994.c
Simple merge
diff --cc sound/soc/mid-x86/sst_platform.c
Simple merge
author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Mon, 18 Apr 2011 16:12:14 +0000 (17:12 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/sn95031.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/wm8994.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/mid-x86/sst_platform.c	patch \|	diff1 \|	diff2 \|	blob \| history