Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Mon, 29 Jun 2009 07:16:13 +0000 (09:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 29 Jun 2009 07:16:25 +0000 (09:16 +0200)
commit348b346b238d9c0e5694c8d0b835a099cb383835
tree967d9c72a1d6d33a408a1ff0d732296dbe8d3674
parent6c697bdf08a09ce461e305a22362973036e95db3
parent52989765629e7d182b4f146050ebba0abf2cb0b7
Merge branch 'linus' into sched/core

Merge reason: we will merge a dependent patch.

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