tree 77b414696b5016a9ff36b31f1e626b42bcf5f778
parent 1154768ad342cc3ad295340130c1fad6869effa9
parent 52eabba5bcdb2853dec6ef007ba427b092034738
author Bjorn Helgaas <bhelgaas@google.com> 1493393621 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1493393621 -0500

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