Merge branch 'pci/switchtec' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 31 Jan 2018 16:13:07 +0000 (10:13 -0600)
committerBjorn Helgaas <helgaas@kernel.org>
Wed, 31 Jan 2018 16:13:07 +0000 (10:13 -0600)
commit6a436fa81252b3a302d61133c784472a237b6dd7
treeb27ae295c39997e681fb40e88a9d1ed6edf633a7
parent414ae7609e19580a56647344e61f13f3768e0820
parentbb6b42b4fb8e4b488c1282fa7c0f26953ceef0b4
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