git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Joerg Roedel <joerg.roedel@amd.com>
	Tue, 6 Dec 2011 14:19:36 +0000 (15:19 +0100)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Tue, 6 Dec 2011 14:19:36 +0000 (15:19 +0100)
commit	3a4786b016fe49b17fbe141ac62659b0c1be514c
tree	1f21bd579ecb80461984e6acda93c795687233b5	tree \| snapshot
parent	89e0b9a3fd66d72f2d7b7f2d6d86fa56997cde27	commit \| diff
parent	1a36ea815a3557c03819ec7c90a6b2fb128385ca	commit \| diff
parent	6c274d1cd5b3aa0834e9f0c3f58038f42278ff8c	commit \| diff
parent	95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b	commit \| diff

Merge branches 'iommu/fixes', 'arm/omap', '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	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/iommu/iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/iommu/omap-iovmm.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/linux/iommu.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history