Merge branch 'acpi-pnp'