diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 19:47:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 19:47:12 +0200 |
| commit | 725c25819e4a0dafdcf42a5f31bc569341919c7c (patch) | |
| tree | cd2f3d763848dc550c19daf42f6146425aff058c /include/asm-x86/mach-numaq/mach_apic.h | |
| parent | 3dd392a407d15250a501fa109cc1f93fee95ef85 (diff) | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| parent | 129d6aba444d1e99d4cbfb9866a4652912426b65 (diff) | |
| parent | 1e19b16a30c34c042f1eaa23db4c99bfad1dac0e (diff) | |
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B
Conflicts:
arch/x86/kernel/pci-gart_64.c
include/asm-x86/dma-mapping.h