Merge branches 'acpi-processor' and 'pnp'