Merge commit 'refs/next/20120814/tip'

author Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 17 Aug 2012 02:25:57 +0000 (12:25 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Fri, 17 Aug 2012 02:25:57 +0000 (12:25 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 02:25:57 +0000 (12:25 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 17 Aug 2012 02:25:57 +0000 (12:25 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 17 Aug 2012 02:25:57 +0000 (12:25 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 17 Aug 2012 02:25:57 +0000 (12:25 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history