summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
authorJoerg Roedel <joerg.roedel@amd.com>2012-01-09 13:06:28 +0100
committerJoerg Roedel <joerg.roedel@amd.com>2012-01-09 13:06:28 +0100
commitf93ea733878733f3e98475bc3e2ccf789bebcfb8 (patch)
treece4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0 /arch/arm/mach-davinci
parent00fb5430f547e411ab03385cfa548776aaac1c92 (diff)
parent95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b (diff)
downloadtalos-op-linux-f93ea733878733f3e98475bc3e2ccf789bebcfb8.tar.gz
talos-op-linux-f93ea733878733f3e98475bc3e2ccf789bebcfb8.zip
Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
Conflicts: drivers/iommu/amd_iommu.c drivers/iommu/intel-iommu.c include/linux/iommu.h
Diffstat (limited to 'arch/arm/mach-davinci')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud