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

author	Joerg Roedel <joerg.roedel@amd.com>
	Wed, 12 Oct 2011 09:52:22 +0000 (11:52 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Wed, 12 Oct 2011 09:52:22 +0000 (11:52 +0200)
commit	56bede1a2c4a1083283583186946e1699d64e27d
tree	d52f451cb85047f4c546716a36bdc362342365e1	tree \| snapshot
parent	fcd0861db1cf4e6ed99f60a815b7b72c2ed36ea4	commit \| diff
parent	e4efd94bde1a2df9f1344ff936d42b4a78b9acc0	commit \| diff
parent	0ed6d2d27bcc2ace454a8c55446e1bc3efd2d529	commit \| diff
parent	d8011fc9d6d0c9279e712c346432f2bec7aabca7	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 \|	blob \| history
drivers/iommu/iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
drivers/iommu/omap-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history
include/linux/iommu.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	blob \| history