Skip to content
Snippets Groups Projects
Commit 604c307b authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats'... 

Merge branches 'dma-debug/next', 'amd-iommu/command-cleanups', 'amd-iommu/ats' and 'amd-iommu/extended-features' into iommu/2.6.40

Conflicts:
	arch/x86/include/asm/amd_iommu_types.h
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c
parents e9696875 ba4b87ad fd7b5535 58fc7f14
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 438 additions and 270 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment