diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-25 21:52:02 +0200 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-25 21:52:02 +0200 |
commit | c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4 (patch) | |
tree | 25b6008dcc5f67eb48746f91daafcefac2605406 /drivers/pci/hotplug | |
parent | Merge branches 'pci/host-mvebu' and 'pci/host-spear' into next (diff) | |
parent | PCI: Generate uppercase hex for modalias interface class (diff) | |
parent | PCI: Add ACS quirk for Solarflare SFC9120 & SFC9140 (diff) | |
parent | PCI: Remove assignment from complicated "if" conditions (diff) | |
download | linux-c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4.tar.xz linux-c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4.zip |
Merge branches 'pci/enumeration', 'pci/virtualization' and 'pci/cleanup' into next
* pci/enumeration:
PCI: Generate uppercase hex for modalias interface class
* pci/virtualization:
PCI: Add ACS quirk for Solarflare SFC9120 & SFC9140
PCI: Remove unused pci_get_dma_source()
PCI: Remove unused pci_find_upstream_pcie_bridge()
* pci/cleanup:
PCI: Remove assignment from complicated "if" conditions
PCI: Remove assignment from "if" conditions
PCI: Remove unnecessary curly braces
PCI: Add space before open parenthesis