Merge branches 'pnp', 'acpi-resource' and 'acpica'