Merge back earlier 'acpi-pci' material for v4.2.