Merge branch 'sched/core' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 12:48:57 +0000 (13:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 12 Dec 2008 12:48:57 +0000 (13:48 +0100)
Conflicts:
include/linux/ftrace.h
kernel/sched.c


Trivial merge