Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000 (18:33 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 16 Dec 2009 17:33:49 +0000 (18:33 +0100)
commitee1156c11a1121e118b0a7f2dec240f0d421b1fd
treeb8771cc5a9758af9d7410fc519227c036c222130
parentb9f8fcd55bbdb037e5332dbdb7b494f0b70861ac
parent8bea8672edfca7ec5f661cafb218f1205863b343
Merge branch 'linus' into sched/urgent

Conflicts:
kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.

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