From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Apr 2017 15:33:41 +0000 (-0500)
Subject: Merge branch 'pci/switchtec' into next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d060c6fcef972e6a8d0898c55f1b7b6da89a6744;p=linux.git

Merge branch 'pci/switchtec' into next

* pci/switchtec:
  switchtec: Add IOCTLs to the Switchtec driver
  switchtec: Add sysfs attributes to the Switchtec driver
  switchtec: Add user interface documentation
  MicroSemi Switchtec management interface driver

Conflicts:
	drivers/pci/Kconfig
---

d060c6fcef972e6a8d0898c55f1b7b6da89a6744
diff --cc drivers/pci/Kconfig
index 9747c1ec8c743,c0bb4cbd1edbe..e0cacb7b85634
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@@ -134,4 -134,4 +134,5 @@@ config PCI_HYPER
  source "drivers/pci/hotplug/Kconfig"
  source "drivers/pci/dwc/Kconfig"
  source "drivers/pci/host/Kconfig"
 +source "drivers/pci/endpoint/Kconfig"
+ source "drivers/pci/switch/Kconfig"