Skip to content
Commit 795e74f7 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

Merge branch 'iommu/largepages' into amd-iommu/2.6.35 

Conflicts:
	arch/x86/kernel/amd_iommu.c
parents a5235725 12c7389a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment