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

Documentation/filesystems/sysfs-pci.txt

Documentation/pci-error-recovery.txt

MAINTAINERS

arch/alpha/kernel/sys_alcor.c

arch/alpha/kernel/sys_sio.c

arch/frv/mb93090-mb00/pci-frv.c

arch/frv/mb93090-mb00/pci-irq.c

arch/i386/kernel/scx200.c

arch/i386/pci/acpi.c

arch/i386/pci/fixup.c

arch/i386/pci/irq.c

arch/mips/vr41xx/common/vrc4173.c

arch/ppc/kernel/pci.c

arch/ppc/platforms/85xx/mpc85xx_cds_common.c

arch/sparc64/kernel/ebus.c

drivers/acpi/pci_irq.c

drivers/block/DAC960.c

drivers/block/cciss.c

drivers/block/sx8.c

drivers/block/umem.c