diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-25 13:52:02 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-25 13:52:02 -0600 |
| commit | c0ed74e9d026af7b4f79bc29aaac37aac5b6e0a4 (patch) | |
| tree | 25b6008dcc5f67eb48746f91daafcefac2605406 /drivers/pci/pci.c | |
| parent | b1bf29577870d7b10167d1d8ac86e08757993016 (diff) | |
| parent | 89ec3dcf17fd3fa009ecf8faaba36828dd6bc416 (diff) | |
| parent | 89b51cb5c3b0e8c2b8016c60f3386a5bfa468498 (diff) | |
| parent | 2f4096e311ef0922c42cbf7bc5df44efb3aff716 (diff) | |
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