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 /arch/ia64 | |
| parent | Merge branch 'linus' into x86/pat2 (diff) | |
| parent | Linux 2.6.27-rc7 (diff) | |
| parent | x86, AMD IOMMU: initialize dma_ops after sysfs registration (diff) | |
| parent | AMD IOMMU: use iommu_device_max_index, fix (diff) | |
| download | linux-725c25819e4a0dafdcf42a5f31bc569341919c7c.tar.xz linux-725c25819e4a0dafdcf42a5f31bc569341919c7c.zip | |
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