summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-09-03 16:32:00 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2009-09-03 16:32:00 +0200
commit85da07c409daba3d067824f0051d58f70cb571a0 (patch)
tree68e16cf191efb3d27181e717e8cf288f911eff04 /arch/x86/kernel
parent6ac162d6c01ac7626f46c68c0770556cf682ce34 (diff)
parente0faf54ee82bf9c07f0307b4391caad4020bd659 (diff)
parent6a1eddd2f951656a6abbd42e2cddc2267c4a639d (diff)
Merge branches 'gart/fixes', 'amd-iommu/fixes+cleanups' and 'amd-iommu/fault-handling' into amd-iommu/2.6.32