Pull vtd-iommu into release branch

Conflicts:
	arch/ia64/kernel/acpi.c