diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:55:06 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 11:55:12 +0100 |
| commit | 9a3d8f735eee90bb5b1351983e946bc637041c01 (patch) | |
| tree | bdbe6d9f986e9715f8d9b45499f969fa7b51c6a3 /include/linux/topology.h | |
| parent | Merge branch 'linus' into cpus4096 (diff) | |
| parent | x86: apic reset counter on shutdown (diff) | |
| download | linux-dev-9a3d8f735eee90bb5b1351983e946bc637041c01.tar.xz linux-dev-9a3d8f735eee90bb5b1351983e946bc637041c01.zip | |
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.
Diffstat (limited to 'include/linux/topology.h')
0 files changed, 0 insertions, 0 deletions