Merge back earlier 'acpi-pci' material for v4.2.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Jun 2015 07:58:26 +0000 (09:58 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 8 Jun 2015 07:58:26 +0000 (09:58 +0200)

Trivial merge