Skip to content
Commit 03362a05 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

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

Conflicts:
	arch/x86/kernel/amd_iommu.c
	arch/x86/kernel/amd_iommu_init.c
parents 85da07c4 4751a951
Hide whitespace changes
Inline Side-by-side
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