Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 13:50:22 +0000 (15:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 18 Jul 2009 13:50:40 +0000 (15:50 +0200)
commit5304d5fc74a269cc6c3e70f9713684ca729abdf0
tree6a5db62915abd260241a2b9aee34086c93293ca6
parent54d35f29f49224d86b994acb6e5969b9ba09022d
parent78af08d90b8f745044b1274430bc4bc6b2b27aca
Merge branch 'linus' into sched/core

Merge reason: branch had an old upstream base (-rc1-ish), but also
              merge to avoid a conflict.

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