Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI: remove unused resource assignment in pci_read_bridge_bases() PCI hotplug: shpchp: message refinement PCI hotplug: shpchp: replace printk with dev_printk PCI: add routines for debugging and handling lost interrupts PCI hotplug: pciehp: message refinement PCI: fix ARI code to be compatible with mixed ARI/non-ARI systems PCI hotplug: cpqphp: fix kernel NULL pointer dereference
Showing
- drivers/pci/Makefile 2 additions, 1 deletiondrivers/pci/Makefile
- drivers/pci/hotplug/cpqphp_core.c 1 addition, 1 deletiondrivers/pci/hotplug/cpqphp_core.c
- drivers/pci/hotplug/pciehp.h 1 addition, 1 deletiondrivers/pci/hotplug/pciehp.h
- drivers/pci/hotplug/pciehp_core.c 20 additions, 18 deletionsdrivers/pci/hotplug/pciehp_core.c
- drivers/pci/hotplug/pciehp_ctrl.c 32 additions, 32 deletionsdrivers/pci/hotplug/pciehp_ctrl.c
- drivers/pci/hotplug/pciehp_hpc.c 17 additions, 26 deletionsdrivers/pci/hotplug/pciehp_hpc.c
- drivers/pci/hotplug/pciehp_pci.c 8 additions, 11 deletionsdrivers/pci/hotplug/pciehp_pci.c
- drivers/pci/hotplug/shpchp.h 19 additions, 3 deletionsdrivers/pci/hotplug/shpchp.h
- drivers/pci/hotplug/shpchp_core.c 30 additions, 18 deletionsdrivers/pci/hotplug/shpchp_core.c
- drivers/pci/hotplug/shpchp_ctrl.c 89 additions, 69 deletionsdrivers/pci/hotplug/shpchp_ctrl.c
- drivers/pci/hotplug/shpchp_hpc.c 57 additions, 56 deletionsdrivers/pci/hotplug/shpchp_hpc.c
- drivers/pci/hotplug/shpchp_pci.c 20 additions, 16 deletionsdrivers/pci/hotplug/shpchp_pci.c
- drivers/pci/irq.c 60 additions, 0 deletionsdrivers/pci/irq.c
- drivers/pci/pci.c 13 additions, 8 deletionsdrivers/pci/pci.c
- drivers/pci/probe.c 0 additions, 3 deletionsdrivers/pci/probe.c
- include/linux/pci.h 7 additions, 0 deletionsinclude/linux/pci.h
Loading
Please register or sign in to comment