Merge back earlier ACPICA material.

Conflicts:
	drivers/acpi/acpica/acglobal.h