| commit | 9a3d8f735eee90bb5b1351983e946bc637041c01 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Thu Dec 18 11:55:06 2008 +0100 |
| committer | Ingo Molnar <mingo@elte.hu> | Thu Dec 18 11:55:12 2008 +0100 |
| tree | bdbe6d9f986e9715f8d9b45499f969fa7b51c6a3 | |
| parent | b9974dc6bddd41fbdc2583f196a34fbcebd8b089 [diff] | |
| parent | a98f8fd24fb24fcb9a359553e64dd6aac5cf4279 [diff] |
Merge branch 'x86/apic' into cpus4096 This done for conflict prevention: we merge it into the cpus4096 tree because upcoming cpumask changes will touch apic.c that would collide with x86/apic otherwise.