Merge back earlier ACPICA material.