Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Tue, 4 Oct 2011 09:08:16 +0000 (11:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 4 Oct 2011 09:09:08 +0000 (11:09 +0200)
commit22f92bacbeea24b20e447444c28e7cad9f1ac3f8
tree5c3f2346804a186aa2d954f078fd2f4d44bcc26e
parent557ab425429a5123d37f412ce3e6d6137cb621f8
parent0f86267b79bc6e357b8606077c7f70239045ea9c
Merge branch 'linus' into sched/core

Merge reason: pick up the latest fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/linux/sched.h
kernel/sched.c
kernel/sched_rt.c