| commit | d84705969f898f294bc3fc32eca33580f14105bd | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Fri Oct 10 19:50:00 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Sat Oct 11 20:17:36 2008 +0200 |
| tree | c59c7e835820c6bfb5a957f70e58fee1699a6b38 | |
| parent | 725c25819e4a0dafdcf42a5f31bc569341919c7c [diff] | |
| parent | 11494547b1754c4f3bd7f707ab869e2adf54d52f [diff] |
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B Conflicts: arch/x86/kernel/apic_32.c arch/x86/kernel/apic_64.c arch/x86/kernel/setup.c drivers/pci/intel-iommu.c include/asm-x86/cpufeature.h include/asm-x86/dma-mapping.h