Merge branch 'core/locking' into tracing/ftrace
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 00:33:21 +0000 (01:33 +0100)
commit480c93df5b99699390f93a7024c9f60d09da0e96
treeb93b6c8c71c5f2e716dd05b126e01ef4e20ff0af
parentaecfcde920da8d32949f6cbbc1fc051b4ef9e7be
parentd820ac4c2fa881079e6b689d2098adce337558ae
Merge branch 'core/locking' into tracing/ftrace
MAINTAINERS
Makefile
arch/sparc/kernel/irq_64.c
arch/x86/mm/pageattr.c
include/linux/sched.h
init/Kconfig
kernel/lockdep.c
kernel/softirq.c