diff options
| author | Joerg Roedel | 2009-09-03 17:14:57 +0200 |
|---|---|---|
| committer | Joerg Roedel | 2009-09-03 17:14:57 +0200 |
| commit | 2b681fafcc50fea6304ed418667c9d04282acb73 (patch) | |
| tree | a950c2b32b7cb2e31bd1eb32a72d4983fd553e1e /arch/x86/kernel/pci-dma.c | |
| parent | Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32 (diff) | |
| parent | x86/amd-iommu: Change iommu_map_page to support multiple page sizes (diff) | |
| download | kernel-qcow2-linux-2b681fafcc50fea6304ed418667c9d04282acb73.tar.gz kernel-qcow2-linux-2b681fafcc50fea6304ed418667c9d04282acb73.tar.xz kernel-qcow2-linux-2b681fafcc50fea6304ed418667c9d04282acb73.zip | |
Merge branch 'amd-iommu/pagetable' into amd-iommu/2.6.32
Conflicts:
arch/x86/kernel/amd_iommu.c
Diffstat (limited to 'arch/x86/kernel/pci-dma.c')
0 files changed, 0 insertions, 0 deletions