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: Fix IRQ swizzling for ARI-enabled devices ia64/PCI: adjust section annotation for pcibios_setup() x86/PCI: get root CRS before scanning children x86/PCI: fix boundary checking when using root CRS PCI MSI: Fix restoration of MSI/MSI-X mask states in suspend/resume PCI MSI: Unmask MSI if setup failed PCI MSI: shorten PCI_MSIX_ENTRY_* symbol names PCI: make pci_name() take const argument PCI: More PATA quirks for not entering D3 PCI: fix kernel-doc warnings PCI: check if bus has a proper bridge device before triggering SBR PCI: remove pci_dac_dma_... APIs on mn10300 PCI ECRC: Remove unnecessary semicolons PCI MSI: Return if alloc_msi_entry for MSI-X failed
Showing
- arch/ia64/pci/pci.c 1 addition, 1 deletionarch/ia64/pci/pci.c
- arch/mn10300/include/asm/pci.h 0 additions, 4 deletionsarch/mn10300/include/asm/pci.h
- arch/x86/pci/acpi.c 24 additions, 35 deletionsarch/x86/pci/acpi.c
- arch/x86/pci/amd_bus.c 6 additions, 2 deletionsarch/x86/pci/amd_bus.c
- drivers/pci/hotplug/pci_hotplug_core.c 2 additions, 0 deletionsdrivers/pci/hotplug/pci_hotplug_core.c
- drivers/pci/msi.c 45 additions, 19 deletionsdrivers/pci/msi.c
- drivers/pci/msi.h 5 additions, 5 deletionsdrivers/pci/msi.h
- drivers/pci/pci.c 12 additions, 3 deletionsdrivers/pci/pci.c
- drivers/pci/pcie/aer/ecrc.c 1 addition, 1 deletiondrivers/pci/pcie/aer/ecrc.c
- drivers/pci/quirks.c 5 additions, 0 deletionsdrivers/pci/quirks.c
- drivers/pci/slot.c 2 additions, 2 deletionsdrivers/pci/slot.c
- include/linux/pci.h 1 addition, 1 deletioninclude/linux/pci.h
Loading
Please register or sign in to comment