tree ce4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0
parent 00fb5430f547e411ab03385cfa548776aaac1c92
parent 95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b
author Joerg Roedel <joerg.roedel@amd.com> 1326110788 +0100
committer Joerg Roedel <joerg.roedel@amd.com> 1326110788 +0100

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