tree b27ae295c39997e681fb40e88a9d1ed6edf633a7
parent 414ae7609e19580a56647344e61f13f3768e0820
parent bb6b42b4fb8e4b488c1282fa7c0f26953ceef0b4
author Bjorn Helgaas <bhelgaas@google.com> 1517415187 -0600
committer Bjorn Helgaas <helgaas@kernel.org> 1517415187 -0600

Merge branch 'pci/switchtec' into next

* pci/switchtec:
  switchtec: Add device IDs for PSX 24xG3 and PSX 48xG3
  switchtec: Add Global Fabric Manager Server (GFMS) event