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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/pci/Kconfig
index 9747c1ec8c74389cc152a630a57b68560854ce59,c0bb4cbd1edbe3babca692d4f90022813702a82d..e0cacb7b8563468fe9ce98ed603e176f267c7ac7
--- 1/drivers/pci/Kconfig
--- 2/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"