Merge branches 'amd-iommu/fixes', 'amd-iommu/debug', 'amd-iommu/suspend-resume' and 'amd-iommu/extended-allocator' into amd-iommu/2.6.31

Browse source

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

...

This commit is contained in:

Joerg Roedel 2009-05-28 18:23:56 +02:00

parent c1eee67b2d 2e8b569614 736501ee00 47bccd6bb2

commit 83cce2b69e

6 changed files with 594 additions and 229 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

5

Documentation/kernel-parameters.txt

View file

8

arch/x86/Kconfig.debug

View file

2

arch/x86/include/asm/amd_iommu.h

View file

55

arch/x86/include/asm/amd_iommu_types.h

View file

486

arch/x86/kernel/amd_iommu.c

View file

267

arch/x86/kernel/amd_iommu_init.c

View file