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

author	Joerg Roedel <joerg.roedel@amd.com>
	Fri, 21 Oct 2011 12:38:55 +0000 (14:38 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Fri, 21 Oct 2011 12:38:55 +0000 (14:38 +0200)
commit	1abb4ba596a91a839f82e0c9c837b777d574e83d
tree	6f77339f0d25d429f767833e09cdb0f60b8ff5ec	tree \| snapshot
parent	899e3ee404961a90b828ad527573aaaac39f0ab1	commit \| diff
parent	fcd0861db1cf4e6ed99f60a815b7b72c2ed36ea4	commit \| diff
parent	e4efd94bde1a2df9f1344ff936d42b4a78b9acc0	commit \| diff
parent	0ed6d2d27bcc2ace454a8c55446e1bc3efd2d529	commit \| diff
parent	94441c3bd99287b9d84f148a08cc9a44675ec749	commit \| diff

Merge branches 'amd/fixes', 'debug/dma-api', 'arm/omap', 'arm/msm', 'core', 'iommu/fault-reporting' and 'api/iommu-ops-per-bus' into next

Conflicts:
drivers/iommu/amd_iommu.c
drivers/iommu/iommu.c

drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/iommu/iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/media/video/omap3isp/ispccdc.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
include/linux/iommu.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history