Linus Torvalds b7f21bb2e2 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 ... * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (21 commits) x86/PCI: make 32 bit NUMA node array int, not unsigned char x86/PCI: default pcibus cpumask to all cpus if it lacks affinity MAINTAINTERS: remove hotplug driver entries PCI: pciehp: remove slot capabilities definitions PCI: pciehp: remove error message definitions PCI: pciehp: remove number field PCI: pciehp: remove hpc_ops PCI: pciehp: remove pci_dev field PCI: pciehp: remove crit_sect mutex PCI: pciehp: remove slot_bus field PCI: pciehp: remove first_slot field PCI: pciehp: remove slot_device_offset field PCI: pciehp: remove hp_slot field PCI: pciehp: remove device field PCI: pciehp: remove bus field PCI: pciehp: remove slot_num_inc field PCI: pciehp: remove num_slots field PCI: pciehp: remove slot_list field PCI: fix VGA arbiter header file PCI: Disable AER with pci=nomsi ... Fixed up trivial conflicts in MAINTAINERS		2009-09-24 09:57:08 -07:00
..
acpi_pcihp.c	PCI hotplug: clean up acpi_run_hpp()	2009-09-14 17:39:14 -07:00
acpiphp_core.c	PCI hotplug: remove redundant .owner initializations	2009-06-16 14:30:12 -07:00
acpiphp_glue.c	PCI hotplug: acpiphp: use generic pci_configure_slot()	2009-09-14 17:39:12 -07:00
acpiphp_ibm.c	ACPICA: Major update for acpi_get_object_info external interface	2009-08-27 10:17:15 -04:00
acpiphp.h	PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge	2009-09-14 17:38:22 -07:00
cpci_hotplug_core.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
cpci_hotplug_pci.c
cpci_hotplug.h
cpcihp_generic.c
cpcihp_zt5550.c
cpcihp_zt5550.h
cpqphp_core.c	PCI hotplug: remove redundant .owner initializations	2009-06-16 14:30:12 -07:00
cpqphp_ctrl.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
cpqphp_nvram.c
cpqphp_nvram.h
cpqphp_pci.c
cpqphp_sysfs.c	headers: smp_lock.h redux	2009-07-12 12:22:34 -07:00
cpqphp.h
fakephp.c
ibmphp_core.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6	2009-06-22 11:59:51 -07:00
ibmphp_ebda.c
ibmphp_hpc.c
ibmphp_pci.c
ibmphp_res.c
ibmphp.h
Kconfig	PCI: drivers/pci/slot.c should depend on CONFIG_SYSFS	2009-06-18 13:57:24 -07:00
Makefile	PCI hotplug: add pci_configure_slot()	2009-09-14 17:39:05 -07:00
pci_hotplug_core.c	PCI hotplug: add support for 5.0G link speed	2009-09-09 13:29:50 -07:00
pciehp_acpi.c	PCI: pciehp: remove slot_list field	2009-09-17 10:05:31 -07:00
pciehp_core.c	PCI: pciehp: remove number field	2009-09-17 10:06:36 -07:00
pciehp_ctrl.c	PCI: pciehp: remove error message definitions	2009-09-17 10:06:41 -07:00
pciehp_hpc.c	PCI: pciehp: remove number field	2009-09-17 10:06:36 -07:00
pciehp_pci.c	PCI: pciehp: remove hpc_ops	2009-09-17 10:06:31 -07:00
pciehp.h	PCI: pciehp: remove slot capabilities definitions	2009-09-17 10:06:46 -07:00
pcihp_skeleton.c	PCI hotplug: remove redundant .owner initializations	2009-06-16 14:30:12 -07:00
pcihp_slot.c	PCI hotplug: add pci_configure_slot()	2009-09-14 17:39:05 -07:00
rpadlpar_core.c
rpadlpar_sysfs.c
rpadlpar.h
rpaphp_core.c	PCI hotplug: remove redundant .owner initializations	2009-06-16 14:30:12 -07:00
rpaphp_pci.c
rpaphp_slot.c
rpaphp.h
sgi_hotplug.c	PCI hotplug: SGI hotplug: do not use hotplug_slot_attr	2009-08-07 10:36:27 -07:00
shpchp_core.c	PCI hotplug: remove redundant .owner initializations	2009-06-16 14:30:12 -07:00
shpchp_ctrl.c
shpchp_hpc.c
shpchp_pci.c	PCI hotplug: shpchp: use generic pci_configure_slot()	2009-09-14 17:39:11 -07:00
shpchp_sysfs.c
shpchp.h	PCI hotplug: shpchp: use generic pci_configure_slot()	2009-09-14 17:39:11 -07:00