summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2009-11-03 12:05:40 +0100
committerJoerg Roedel <joerg.roedel@amd.com>2009-11-03 12:05:40 +0100
commit342688f9db392ec82ab9e6b25a6137f9ee1647d7 (patch)
treee55eca548851778a559674e467e34574ae2c633a /arch/x86
parentLinux 2.6.32-rc5 (diff)
parentx86/amd-iommu: Un__init function required on shutdown (diff)
parentdma-debug: Fix compile warning with PAE enabled (diff)
downloadlinux-342688f9db392ec82ab9e6b25a6137f9ee1647d7.tar.xz
linux-342688f9db392ec82ab9e6b25a6137f9ee1647d7.zip
Merge branches 'amd-iommu/fixes' and 'dma-debug/fixes' into iommu/fixes