Merge branches 'acpi-pnp' and 'pnp'