Merge remote-tracking branch 'tip/auto-latest'

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

Wed, 2 Nov 2011 03:20:21 +0000 (14:20 +1100)

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

Wed, 2 Nov 2011 03:20:21 +0000 (14:20 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 03:20:21 +0000 (14:20 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Nov 2011 03:20:21 +0000 (14:20 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Nov 2011 03:20:21 +0000 (14:20 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Nov 2011 03:20:21 +0000 (14:20 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history