Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...
[pandora-kernel.git] / kernel / sched.c
diff --cc kernel/sched.c
Simple merge