Pull vtd-iommu into release branch
authorTony Luck <tony.luck@intel.com>
Fri, 17 Oct 2008 20:52:22 +0000 (13:52 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 17 Oct 2008 20:52:22 +0000 (13:52 -0700)
commitfe393164c529f72def1952fb66c11732d0984d78
tree56e4425988e90cb9608e95844f577cd18009618c
parent22ca532a4d137545244fdff0b687325fd4e13eae
parent62fdd7678a26efadd6ac5c2869543caff77d2df0
Pull vtd-iommu into release branch

Conflicts:
arch/ia64/kernel/acpi.c
arch/ia64/Kconfig
arch/ia64/Makefile
arch/ia64/include/asm/machvec.h
arch/ia64/kernel/Makefile
arch/ia64/kernel/acpi.c