Merge commit 'v2.6.28' into core/core
Ingo Molnar [Thu, 25 Dec 2008 12:51:46 +0000 (13:51 +0100)]
1  2 
kernel/posix-cpu-timers.c
kernel/sched.c
kernel/softlockup.c

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