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

This commit is contained in:
Rafael J. Wysocki 2015-06-08 09:58:26 +02:00
commit 302ebef889