tree 8448ece35101d8db945c49df50d0d5889687de9f
parent a52357259680fe5368c2fabf5949209e231f2aa2
parent 12c7389abe5786349d3ea6da1961cf78d0c1c7cd
author Joerg Roedel <joerg.roedel@amd.com> 1273592457 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1273592457 +0200

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

Conflicts:
	arch/x86/kernel/amd_iommu.c