| commit | ee1156c11a1121e118b0a7f2dec240f0d421b1fd | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Dec 16 18:33:49 2009 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Dec 16 18:33:49 2009 +0100 |
| tree | b8771cc5a9758af9d7410fc519227c036c222130 | |
| parent | b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac [diff] | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 [diff] |
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>