tree d8c3c3ff835da7238cc0b1d6817f7bcf5b735ecd
parent 7282059489868e0ed1b0d79765730c6b233a8399
parent 21369c77477a7f937174833c8094154f0f995710
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1392206216 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1392206216 +0100

Merge back earlier 'acpi-pci-hotplug' material.

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c