diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-09 12:45:58 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-02-09 12:45:58 -0600 |
| commit | 129aaabc84b2304d8f5f396e845bb66583e30c56 (patch) | |
| tree | 0cbd219b94b68e7baf685232a29e71d49b173043 /drivers/w1 | |
| parent | 92e963f50fc74041b5e9e744c330dca48e04f08d (diff) | |
| parent | 0e6053dc6e7a42c8ba9ce6e81adb3350c7df4bc8 (diff) | |
| parent | 952bbcb0781bd1341f6a9f5c96fc32737392c04a (diff) | |
| parent | b404bcfbf035413dcce539c8ba2c9986d220d8ed (diff) | |
Merge branches 'pci/aer', 'pci/misc' and 'pci/virtualization' into next
* pci/aer:
PCI/AER: Use list_first_entry_or_null() to simplify code
PCI/AER: Restore pci_ops pointer while calling original pci_ops
PCI/AER: Rename pci_ops_aer to aer_inj_pci_ops
* pci/misc:
PCI: Remove includes of asm/pci-bridge.h
PCI: Remove empty asm-generic/pci-bridge.h
ARM64: PCI: Remove generated include of asm-generic/pci-bridge.h
PCI: Remove includes of empty asm-generic/pci-bridge.h
PCI: Move pci_set_flags() from asm-generic/pci-bridge.h to linux/pci.h
PCI/PME: Restructure pcie_pme_suspend() to prevent compiler warning
PCI/PME: Remove redundant port lookup
PCI: Check device_attach() return value always
* pci/virtualization:
PCI: Add ACS quirk for all Cavium devices