]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next
authorJoerg Roedel <joerg.roedel@amd.com>
Tue, 15 Nov 2011 11:49:31 +0000 (12:49 +0100)
committerJoerg Roedel <joerg.roedel@amd.com>
Tue, 15 Nov 2011 11:49:31 +0000 (12:49 +0100)
commita7e892e5b70024ea027c3595f603ce2f92a3a8c1
treed3087d5308ebd7a9e310b001f19fd50324eecaf4
parent08f2e6312c67fed80df9342e06ad36daf11eb80b
parent6c274d1cd5b3aa0834e9f0c3f58038f42278ff8c
parent95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b
Merge branches 'iommu/fixes', 'iommu/page-sizes' and 'iommu/group-id' into next

Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
include/linux/iommu.h
drivers/iommu/amd_iommu.c
drivers/iommu/intel-iommu.c
drivers/iommu/iommu.c
drivers/iommu/omap-iovmm.c
include/linux/iommu.h