diff options
author | Doug Ledford <dledford@redhat.com> | 2016-05-26 12:50:05 -0400 |
---|---|---|
committer | Doug Ledford <dledford@redhat.com> | 2016-05-26 12:50:05 -0400 |
commit | 8779e7658df2496f27660586e3a20a86c75fb526 (patch) | |
tree | 831a1ebc8e399ee231fe23cf1eecc3fc4a70948a /MAINTAINERS | |
parent | e6f61130ed7a124138c4f7b1bd35e24e8113cb83 (diff) | |
parent | f158486527ebfb4c1fe4dcb69b12479090d66b72 (diff) |
Merge branch 'hfi1-2' into k.o/for-4.7
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index c8025946eaae..98234560cfdc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5086,6 +5086,13 @@ F: drivers/block/cciss* F: include/linux/cciss_ioctl.h F: include/uapi/linux/cciss_ioctl.h +HFI1 DRIVER +M: Mike Marciniszyn <mike.marciniszyn@intel.com> +M: Dennis Dalessandro <dennis.dalessandro@intel.com> +L: linux-rdma@vger.kernel.org +S: Supported +F: drivers/infiniband/hw/hfi1 + HFS FILESYSTEM L: linux-fsdevel@vger.kernel.org S: Orphan @@ -10661,12 +10668,6 @@ M: Arnaud Patard <arnaud.patard@rtp-net.org> S: Odd Fixes F: drivers/staging/xgifb/ -HFI1 DRIVER -M: Mike Marciniszyn <infinipath@intel.com> -L: linux-rdma@vger.kernel.org -S: Supported -F: drivers/staging/rdma/hfi1 - STARFIRE/DURALAN NETWORK DRIVER M: Ion Badulescu <ionut@badula.org> S: Odd Fixes |