| commit | 0bcfe75807944106a3aa655a54bb610d62f3a7f5 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Aug 05 09:46:29 2010 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Aug 05 09:46:29 2010 +0200 |
| tree | d48d848e09d1bf48fe7fa23e9226f38ef342eed4 | |
| parent | eebef74695e1498e04e5f85be9c6f84bd2e7358a [diff] | |
| parent | 396e894d289d69bacf5acd983c97cd6e21a14c08 [diff] |
Merge branch 'sched/urgent' into sched/core Conflicts: include/linux/sched.h Merge reason: Add the leftover .35 urgent bits, fix the conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu>