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: PCIe AER: prevent AER injection if hardware masks error reporting PCI/PM: Use per-device D3 delays PCI: Check the node argument passed to cpumask_of_node PCI: AER: fix aer inject result in kernel oops PCI: pcie portdrv: style cleanup
Showing
- drivers/net/sky2.c 1 addition, 0 deletionsdrivers/net/sky2.c
- drivers/pci/pci-sysfs.c 4 additions, 2 deletionsdrivers/pci/pci-sysfs.c
- drivers/pci/pci.c 15 additions, 4 deletionsdrivers/pci/pci.c
- drivers/pci/pcie/aer/aer_inject.c 26 additions, 2 deletionsdrivers/pci/pcie/aer/aer_inject.c
- drivers/pci/pcie/portdrv_core.c 7 additions, 9 deletionsdrivers/pci/pcie/portdrv_core.c
- drivers/pci/pcie/portdrv_pci.c 8 additions, 9 deletionsdrivers/pci/pcie/portdrv_pci.c
- include/linux/pci.h 1 addition, 0 deletionsinclude/linux/pci.h
Loading
Please register or sign in to comment