]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
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)
commit45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df
tree4d51c73533c386aee16fde1e74b5e3bc22eedc53
parent81444a799550214f549caf579cf65a0ca55e70b7
parentd65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c
Merge branch 'sched/core' into cpus4096

Conflicts:
include/linux/ftrace.h
kernel/sched.c
include/linux/ftrace.h
include/linux/sched.h
kernel/fork.c
kernel/posix-cpu-timers.c
kernel/sched.c
kernel/sched_rt.c
kernel/softlockup.c