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)
commita1be621dfacbef0fd374d8acd553d71e07bf29ac
tree32b0355454b43b1098b5e01dd699fd7281abf781
parent3612fdf780e28b10323dd12d2b0f306c7ada4d4c
parentfec6c6fec3e20637bee5d276fb61dd8b49a3f9cc
Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc7' into tracing/core
MAINTAINERS
arch/x86/mm/init_64.c
include/linux/sched.h
init/main.c
kernel/sched.c