Merge branch 'x86/core' into x86/kconfig

author Ingo Molnar <[email protected]>

Fri, 13 Mar 2009 16:08:30 +0000 (17:08 +0100)

committer Ingo Molnar <[email protected]>

Fri, 13 Mar 2009 16:08:30 +0000 (17:08 +0100)
author Ingo Molnar <[email protected]>
Fri, 13 Mar 2009 16:08:30 +0000 (17:08 +0100)
committer Ingo Molnar <[email protected]>
Fri, 13 Mar 2009 16:08:30 +0000 (17:08 +0100)
diff --cc Makefile
Simple merge
diff --cc arch/sparc/kernel/irq_64.c
Simple merge
diff --cc arch/x86/Kconfig
Simple merge
diff --cc include/linux/sched.h
Simple merge
author	Ingo Molnar <[email protected]>
	Fri, 13 Mar 2009 16:08:30 +0000 (17:08 +0100)
committer	Ingo Molnar <[email protected]>
	Fri, 13 Mar 2009 16:08:30 +0000 (17:08 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history