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 /arch/ia64/kernel/pci-dma.c | |
| 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.
Diffstat (limited to 'arch/ia64/kernel/pci-dma.c')
0 files changed, 0 insertions, 0 deletions