Merge with /home/shaggy/git/linus-clean/

Documentation/acpi-hotkey.txt

Documentation/kernel-parameters.txt

Documentation/pci.txt

MAINTAINERS

arch/ppc64/kernel/LparData.c

arch/ppc64/kernel/Makefile

arch/ppc64/kernel/head.S

arch/ppc64/kernel/lparmap.c

drivers/acpi/osl.c

drivers/base/class.c

drivers/pci/hotplug/pciehp.h

drivers/pci/hotplug/pciehp_core.c

drivers/pci/hotplug/pciehp_ctrl.c

drivers/pci/hotplug/pciehp_hpc.c

drivers/pci/hotplug/pciehp_pci.c

drivers/pci/hotplug/pciehprm.h

drivers/pci/hotplug/pciehprm_acpi.c

drivers/pci/hotplug/pciehprm_nonacpi.c

drivers/pci/hotplug/pciehprm_nonacpi.h

drivers/pci/hotplug/shpchp.h