From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 31 Jan 2018 16:13:07 +0000 (-0600)
Subject: Merge branch 'pci/switchtec' into next
X-Git-Tag: v4.16-rc1~60^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6a436fa81252b3a302d61133c784472a237b6dd7;p=users%2Fjedix%2Flinux-maple.git

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
---

6a436fa81252b3a302d61133c784472a237b6dd7