Merge branch 'core/locking' into tracing/ftrace

author Ingo Molnar <mingo@elte.hu>

Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)

committer Ingo Molnar <mingo@elte.hu>

Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)
author Ingo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)
committer Ingo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc arch/sparc/kernel/irq_64.c
Simple merge
diff --cc arch/x86/mm/pageattr.c
Simple merge
diff --cc include/linux/sched.h
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc kernel/lockdep.c
Simple merge
diff --cc kernel/softirq.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/irq_64.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pageattr.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	patch \|	diff1 \|	diff2 \|	blob \| history
init/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/lockdep.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	patch \|	diff1 \|	diff2 \|	blob \| history