arch/x86/kernel/amd_iommu.c · ac2b86fdef5b44f194eefaa6b7b6aea9423d1bc2 · jan.koester / Linux · GitLab

Oct 10, 2008
725c2581
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B · 725c2581
Ingo Molnar authored Oct 10, 2008
```
Conflicts:
	arch/x86/kernel/pci-gart_64.c
	include/asm-x86/dma-mapping.h
```
725c2581
Merge branches 'core/iommu', 'x86/amd-iommu' and 'x86/iommu' into x86-v28-for-linus-phase3-B
Ingo Molnar authored Oct 10, 2008
```
Conflicts:
	arch/x86/kernel/pci-gart_64.c
	include/asm-x86/dma-mapping.h
```