Merge commit 'v2.6.28-rc7' into tracing/core
Ingo Molnar [Thu, 4 Dec 2008 08:07:19 +0000 (09:07 +0100)]
1  2 
arch/powerpc/kernel/entry_64.S
include/linux/sched.h
kernel/profile.c
kernel/sched.c
kernel/sysctl.c

Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge