git.stricted.de - GitHub/mt8127/android_kernel_alcatel

author	Joerg Roedel <joerg.roedel@amd.com>
	Mon, 23 Jul 2012 10:17:00 +0000 (12:17 +0200)
committer	Joerg Roedel <joerg.roedel@amd.com>
	Mon, 23 Jul 2012 10:17:00 +0000 (12:17 +0200)
commit	395e51f18d3b26619c1c462b7a1c0226846ac0a9
tree	fd0fcf5d1714ba8f634689964dd70add4eab354d	tree \| snapshot (tar.gz zip)
parent	28a33cbc24e4256c143dce96c7d93bf423229f92	commit \| diff
parent	2c9195e990297068d0f1f1bd8e2f1d09538009da	commit \| diff
parent	2c0ae1720c09c6f8fc8c6bcece29dc80b08ca1af	commit \| diff
parent	7d43c2e42cb1e436f97c1763150e4e1122ae0d57	commit \| diff
parent	8ce44a2174c3b07950d7a8d44774e23e60518205	commit \| diff
parent	3177bb76a8c510cbc737425a74e777a9aa253065	commit \| diff

Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next

Conflicts:
drivers/iommu/iommu.c
include/linux/iommu.h

drivers/iommu/amd_iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/amd_iommu_v2.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/iommu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/iommu/tegra-smmu.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/pci/pci.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/pci/quirks.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/linux/device.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/linux/iommu.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history