git.baikalelectronics.ru Git - kernel.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	be83f3872ec7a4f8cd280f91ffcd78117cc45427
tree	6f77339f0d25d429f767833e09cdb0f60b8ff5ec	tree \| snapshot
parent	78426c61c60045fd7113846a0280960338868cb5	commit \| diff
parent	ec86be01ffde9c294cb5a0bd32c41b6cb8e3eff8	commit \| diff
parent	551230bffe5fc3cda034c63af8fc49639dc90292	commit \| diff
parent	f904ef84564121a5e4107527e6c0fa4db2e28ab7	commit \| diff
parent	974cd4eb95fe3bf6ca69de220e77919686df5e0a	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	\|	\|	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