tree fd0fcf5d1714ba8f634689964dd70add4eab354d
parent 28a33cbc24e4256c143dce96c7d93bf423229f92
parent 2c9195e990297068d0f1f1bd8e2f1d09538009da
parent 2c0ae1720c09c6f8fc8c6bcece29dc80b08ca1af
parent 7d43c2e42cb1e436f97c1763150e4e1122ae0d57
parent 8ce44a2174c3b07950d7a8d44774e23e60518205
parent 3177bb76a8c510cbc737425a74e777a9aa253065
author Joerg Roedel <joerg.roedel@amd.com> 1343038620 +0200
committer Joerg Roedel <joerg.roedel@amd.com> 1343038620 +0200

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

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