Skip to content
  • Linus Torvalds's avatar
    Merge tag 'pci-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 3bb07f1b
    Linus Torvalds authored
    Pull PCI changes from Bjorn Helgaas:
     - Host bridge cleanups from Yinghai
     - Disable Bus Master bit on PCI device shutdown (kexec-related)
     - Stratus ftServer fix
     - pci_dev_reset() locking fix
     - IvyBridge graphics erratum workaround
    
    * tag 'pci-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (21 commits)
      microblaze/PCI: fix "io_offset undeclared" error
      x86/PCI: only check for spinlock being held in SMP kernels
      resources: add resource_overlaps()
      PCI: fix uninitialized variable 'cap_mask'
      MAINTAINERS: update PCI git tree and patchwork
      PCI: disable Bus Master on PCI device shutdown
      PCI: work around IvyBridge internal graphics FLR erratum
      x86/PCI: fix unused variable warning in amd_bus.c
      PCI: move mutex locking out of pci_dev_reset function
      PCI: work around Stratus ftServer broken PCIe hierarchy
      x86/PCI: merge pcibios_scan_root() and pci_scan_bus_on_node()
      x86/PCI: dynamically allocate pci_root_info for native host bridge drivers
      x86/PCI: embed pci_sysdata into pci_root_info on ACPI path
      x86/PCI: embed name into pci_root_info struct
      x86/PCI: add host bridge resource release for _CRS path
      x86/PCI: refactor get_current_resources()
      PCI: add host bridge release support
      PCI: add generic device into pci_host_bridge struct
      PCI: rename pci_host_bridge() to find_pci_root_bridge()
      x86/PCI: fix memleak with get_current_resources()
      ...
    3bb07f1b