| commit | d060c6fcef972e6a8d0898c55f1b7b6da89a6744 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Fri Apr 28 10:33:41 2017 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Fri Apr 28 10:33:41 2017 -0500 |
| tree | 77b414696b5016a9ff36b31f1e626b42bcf5f778 | |
| parent | 1154768ad342cc3ad295340130c1fad6869effa9 [diff] | |
| parent | 52eabba5bcdb2853dec6ef007ba427b092034738 [diff] |
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