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

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

Wed, 25 Jul 2012 01:41:28 +0000 (11:41 +1000)

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

Wed, 25 Jul 2012 01:41:28 +0000 (11:41 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:41:28 +0000 (11:41 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 01:41:28 +0000 (11:41 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/include/asm/apic.h
Simple merge
diff --cc arch/x86/kernel/apic/apic.c
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc init/main.c
Simple merge
diff --cc scripts/kconfig/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 01:41:28 +0000 (11:41 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 01:41:28 +0000 (11:41 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/apic.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
scripts/kconfig/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history