Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

Documentation/DocBook/kernel-api.tmpl

arch/i386/pci/fixup.c

drivers/pci/access.c

drivers/pci/hotplug/acpiphp_glue.c

drivers/pci/hotplug/cpcihp_zt5550.c

drivers/pci/hotplug/cpqphp_core.c

drivers/pci/hotplug/rpaphp.h

drivers/pci/hotplug/rpaphp_core.c

drivers/pci/hotplug/rpaphp_pci.c

drivers/pci/hotplug/shpchp.h

drivers/pci/hotplug/shpchp_core.c

drivers/pci/hotplug/shpchp_ctrl.c

drivers/pci/hotplug/shpchp_hpc.c

drivers/pci/hotplug/shpchp_pci.c

drivers/pci/hotplug/shpchp_sysfs.c

drivers/pci/hotplug/shpchprm.h

drivers/pci/hotplug/shpchprm_acpi.c

drivers/pci/hotplug/shpchprm_legacy.c

drivers/pci/hotplug/shpchprm_legacy.h

drivers/pci/hotplug/shpchprm_nonacpi.c