[PATCH] patch 1/8] pciehp: use the PCI core for hotplug resource management

This patch converts the pci express hotplug controller driver
to use the PCI core for resource management. This eliminates a
lot of duplicated code and integrates pciehp with the system's
normal PCI handling code.

Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/pci/hotplug/pciehp.h
Simple merge

diff --cc drivers/pci/hotplug/pciehp_core.c
Simple merge

diff --cc drivers/pci/hotplug/pciehp_ctrl.c
Simple merge

diff --cc drivers/pci/hotplug/pciehp_pci.c
Simple merge

diff --cc drivers/pci/hotplug/pciehprm_acpi.c
Simple merge

diff --cc drivers/pci/hotplug/pciehprm_nonacpi.c
Simple merge