Merge branch 'pci/switchtec' into next
authorBjorn Helgaas <bhelgaas@google.com>
Sun, 2 Jul 2017 23:51:10 +0000 (18:51 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Sun, 2 Jul 2017 23:51:10 +0000 (18:51 -0500)
* pci/switchtec:
  switchtec: Add device IDs for additional Switchtec products
  switchtec: Add "running" status flag to fw partition info ioctl

1  2 
drivers/pci/switch/switchtec.c

Simple merge