diff options
| author | Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:32 -0400 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2016-04-28 15:16:32 -0400 |
| commit | e29bff46b9b8663e1789fbcd65d0ba05a52f08af (patch) | |
| tree | cce17191cf20c60dc917c62f01d96f6b571a47d4 /MAINTAINERS | |
| parent | d53e181c85effdfdec97a760622330626c922d81 (diff) | |
| parent | e6bd18f57aad1a2d1ef40e646d03ed0f2515c9e3 (diff) | |
| download | linux-e29bff46b9b8663e1789fbcd65d0ba05a52f08af.tar.gz linux-e29bff46b9b8663e1789fbcd65d0ba05a52f08af.tar.bz2 linux-e29bff46b9b8663e1789fbcd65d0ba05a52f08af.zip | |
Merge branch 'k.o/for-4.6-rc' into testing/4.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 849133608da7..c8025946eaae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6027,7 +6027,7 @@ F: include/scsi/*iscsi* ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR M: Or Gerlitz <ogerlitz@mellanox.com> -M: Sagi Grimberg <sagig@mellanox.com> +M: Sagi Grimberg <sagi@grimberg.me> M: Roi Dayan <roid@mellanox.com> L: linux-rdma@vger.kernel.org S: Supported @@ -6037,7 +6037,7 @@ Q: http://patchwork.kernel.org/project/linux-rdma/list/ F: drivers/infiniband/ulp/iser/ ISCSI EXTENSIONS FOR RDMA (ISER) TARGET -M: Sagi Grimberg <sagig@mellanox.com> +M: Sagi Grimberg <sagi@grimberg.me> T: git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master L: linux-rdma@vger.kernel.org L: target-devel@vger.kernel.org |