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

Browse source

Conflicts:
	arch/x86/kernel/amd_iommu.c

...

This commit is contained in:

Joerg Roedel 2009-09-03 17:14:57 +02:00

parent 03362a05c5 abdc5eb3d6

commit 2b681fafcc

2 changed files with 178 additions and 113 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

34

arch/x86/include/asm/amd_iommu_types.h

View file

261

arch/x86/kernel/amd_iommu.c

View file