Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next
authorJoerg Roedel <joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:06:28 +0000 (13:06 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Mon, 9 Jan 2012 12:06:28 +0000 (13:06 +0100)
commitf93ea733878733f3e98475bc3e2ccf789bebcfb8
treece4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0
parent00fb5430f547e411ab03385cfa548776aaac1c92
parent95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b
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
Documentation/kernel-parameters.txt
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
drivers/iommu/iommu.c
include/linux/iommu.h