Merge commit 'v2.6.35-rc1' into for-2.6.36

author Mark Brown <[email protected]>

Mon, 31 May 2010 10:07:15 +0000 (11:07 +0100)

committer Mark Brown <[email protected]>

Mon, 31 May 2010 10:07:15 +0000 (11:07 +0100)
author Mark Brown <[email protected]>
Mon, 31 May 2010 10:07:15 +0000 (11:07 +0100)
committer Mark Brown <[email protected]>
Mon, 31 May 2010 10:07:15 +0000 (11:07 +0100)
diff --cc sound/soc/codecs/wm8990.c
Simple merge
diff --cc sound/soc/soc-core.c
Simple merge
author	Mark Brown <[email protected]>
	Mon, 31 May 2010 10:07:15 +0000 (11:07 +0100)
committer	Mark Brown <[email protected]>
	Mon, 31 May 2010 10:07:15 +0000 (11:07 +0100)
		1	2
sound/soc/codecs/wm8990.c	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/soc-core.c	patch \|	diff1 \|	diff2 \|	blob \| history