Joerg Roedel f93ea73387 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		2012-01-09 13:06:28 +01:00
..
amd_iommu_init.c
amd_iommu_proto.h
amd_iommu_types.h
amd_iommu_v2.c
amd_iommu.c	Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next	2012-01-09 13:06:28 +01:00
dmar.c
intel-iommu.c	Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next	2012-01-09 13:06:28 +01:00
intr_remapping.c
intr_remapping.h
iommu.c	Merge branches 'iommu/page-sizes' and 'iommu/group-id' into next	2012-01-09 13:06:28 +01:00
iova.c
Kconfig
Makefile
msm_iommu_dev.c
msm_iommu.c
omap-iommu-debug.c
omap-iommu.c	Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next	2012-01-09 13:04:05 +01:00
omap-iovmm.c	Merge branches 'iommu/fixes', 'arm/omap' and 'x86/amd' into next	2012-01-09 13:04:05 +01:00