]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 10:14:47 +0000 (11:14 +0100)
1  2 
MAINTAINERS
arch/x86/mm/init_64.c
include/linux/sched.h
init/main.c
kernel/sched.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/sched.c
Simple merge