summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-footbridge/ebsa285-pci.c
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2010-05-11 17:40:57 +0200
committerJoerg Roedel <joerg.roedel@amd.com>2010-05-11 17:40:57 +0200
commit795e74f7a69f9c08afa4fa7c86cc4f18a62bd630 (patch)
tree8448ece35101d8db945c49df50d0d5889687de9f /arch/arm/mach-footbridge/ebsa285-pci.c
parentx86/amd-iommu: Add amd_iommu=off command line option (diff)
parentiommu-api: Remove iommu_{un}map_range functions (diff)
downloadlinux-795e74f7a69f9c08afa4fa7c86cc4f18a62bd630.tar.xz
linux-795e74f7a69f9c08afa4fa7c86cc4f18a62bd630.zip
Merge branch 'iommu/largepages' into amd-iommu/2.6.35
Conflicts: arch/x86/kernel/amd_iommu.c
Diffstat (limited to 'arch/arm/mach-footbridge/ebsa285-pci.c')
0 files changed, 0 insertions, 0 deletions