Merge branch 'acpica' into acpi-hotplug

The subsequent commits depend on the 'acpica' material.