diff options
| author | Bjorn Helgaas | 2017-04-28 10:33:41 -0500 |
|---|---|---|
| committer | Bjorn Helgaas | 2017-04-28 10:33:41 -0500 |
| commit | d060c6fcef972e6a8d0898c55f1b7b6da89a6744 (patch) | |
| tree | 77b414696b5016a9ff36b31f1e626b42bcf5f778 /MAINTAINERS | |
| 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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 15ed84389092..196728ea3cf2 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9664,6 +9664,17 @@ S: Maintained F: Documentation/devicetree/bindings/pci/aardvark-pci.txt F: drivers/pci/host/pci-aardvark.c +PCI DRIVER FOR MICROSEMI SWITCHTEC +M: Kurt Schwemmer <kurt.schwemmer@microsemi.com> +M: Stephen Bates <stephen.bates@microsemi.com> +M: Logan Gunthorpe <logang@deltatee.com> +L: linux-pci@vger.kernel.org +S: Maintained +F: Documentation/switchtec.txt +F: Documentation/ABI/testing/sysfs-class-switchtec +F: drivers/pci/switch/switchtec* +F: include/uapi/linux/switchtec_ioctl.h + PCI DRIVER FOR NVIDIA TEGRA M: Thierry Reding <thierry.reding@gmail.com> L: linux-tegra@vger.kernel.org |