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

author	Joerg Roedel <joerg.roedel@amd.com>
	Fri, 16 Dec 2011 14:16:30 +0000 (15:16 +0100)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Fri, 16 Dec 2011 14:16:30 +0000 (15:16 +0100)
commit	624de4ae1718fe6d6e27e5620801bce0f7360e88
tree	227beb9afa5bf479552953b7da44b8b2c6b5c855	tree \| snapshot
parent	8bd6960c6ae65d7f92bfb708154ee813417d7b26	commit \| diff
parent	1a36ea815a3557c03819ec7c90a6b2fb128385ca	commit \| diff
parent	bc21662f729cd17d2af93e149f4eccafc7b10181	commit \| diff
parent	95bdaf71ccf2cb4bba0c9a3d2baea0e7916f466b	commit \| diff

Merge branches 'iommu/fixes', 'arm/omap', 'x86/amd', '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