Merge branch 'amd-iommu/passthrough' into amd-iommu/2.6.32

Browse source

Conflicts:
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c

...

This commit is contained in:

Joerg Roedel 2009-09-03 16:34:23 +02:00

parent 85da07c409 4751a95134

commit 03362a05c5

5 changed files with 143 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/x86/include/asm/amd_iommu.h

View file

4

arch/x86/include/asm/amd_iommu_types.h

View file

141

arch/x86/kernel/amd_iommu.c

View file

8

arch/x86/kernel/amd_iommu_init.c

View file

9

arch/x86/kernel/pci-dma.c

View file