diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-08 11:31:02 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-08 11:31:02 +0200 |
commit | 990d0f2ced23052abc7efa09bd05bff34e00cf73 (patch) | |
tree | df9f3fe5c0417102586087cec63e1d813a8f29cb /arch/x86/kernel/pci-calgary_64.c | |
parent | 85ba94ba0592296053f7f2846812173424afe1cb (diff) | |
parent | 34b3ede2353604ec9861c1d900b2a835ff85de47 (diff) | |
parent | e545a6140b698b2494daf0b32107bdcc5e901390 (diff) | |
parent | d294eb83d8d39a29f01dad391f15fc3a29aa04f9 (diff) |
Merge branches 'sched/devel', 'sched/cpu-hotplug', 'sched/cpusets' and 'sched/urgent' into sched/core