Merge branches 'acpi-pci', 'acpi-soc' and 'pnp'