Skip to content
Commit 975af399 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/enumeration'

- Release OF node when pci_scan_device() fails (Dmitry Baryshkov)

- Add pci_disable_parity() (Bjorn Helgaas)

- Disable Mellanox Tavor parity reporting (Heiner Kallweit)

- Disable N2100 r8169 parity reporting (Heiner Kallweit)

* pci/enumeration:
  ARM: iop32x: disable N2100 PCI parity reporting
  IB/mthca: Disable parity reporting
  PCI: Add pci_disable_parity()
  PCI: Release OF node in pci_scan_device()'s error path
parents a38fd874 0a0b5f4b
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment