]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8c0beba1757d188a34453a150c81ef9c344cb1a3
treece4981e49a75d5bac7f0d2fa4ddcdcc130cf56f0
parent115e896fdf0f40103a706fa7f2cd48e086311043
parenta8df961d8bfdfb5ab35f9a8045ee79de1c4ca6eb
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