Merge commit 'v3.2-rc6' into x86/platform

author Ingo Molnar <mingo@elte.hu>

Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)

committer Ingo Molnar <mingo@elte.hu>

Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
author Ingo Molnar <mingo@elte.hu>
Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
committer Ingo Molnar <mingo@elte.hu>
Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/platform/mrst/mrst.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 18 Dec 2011 09:35:16 +0000 (10:35 +0100)
		1	2
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/mrst/mrst.c	patch \|	diff1 \|	diff2 \|	blob \| history