Merge branch 'sched/urgent' into sched/core
authorIngo Molnar <mingo@elte.hu>
Sun, 2 Aug 2009 12:11:26 +0000 (14:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 2 Aug 2009 12:23:57 +0000 (14:23 +0200)
commit8e9ed8b02490fea577b1eb1704c05bf43c891ed7
tree3c0cc5dd498abcf0cc894e85509c131a0dde9a43
parent716a42348cdaf04534b15fbdc9c83e25baebfed5
parent07903af152b0597d94e9b0030746b63c4664e787
Merge branch 'sched/urgent' into sched/core

Merge reason: avoid upcoming patch conflict.

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