Merge branch 'linus' into perf/urgent, to pick up dependent commits

[people/arne_f/kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index af0cb69f6a3edf8a483b9091c23dfbc6f54b6503..bf1d20695cbf8bce4380626dfda323279cd5877f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6671,7 +6671,7 @@ F:        include/net/ieee802154_netdev.h
 F:     Documentation/networking/ieee802154.txt
 
 IFE PROTOCOL
-M:     Yotam Gigi <yotamg@mellanox.com>
+M:     Yotam Gigi <yotam.gi@gmail.com>
 M:     Jamal Hadi Salim <jhs@mojatatu.com>
 F:     net/ife
 F:     include/net/ife.h
@@ -8743,7 +8743,7 @@ Q:        http://patchwork.ozlabs.org/project/netdev/list/
 F:     drivers/net/ethernet/mellanox/mlxsw/
 
 MELLANOX FIRMWARE FLASH LIBRARY (mlxfw)
-M:     Yotam Gigi <yotamg@mellanox.com>
+M:     mlxsw@mellanox.com
 L:     netdev@vger.kernel.org
 S:     Supported
 W:     http://www.mellanox.com
@@ -10890,7 +10890,7 @@ S:      Maintained
 F:     drivers/block/ps3vram.c
 
 PSAMPLE PACKET SAMPLING SUPPORT:
-M:     Yotam Gigi <yotamg@mellanox.com>
+M:     Yotam Gigi <yotam.gi@gmail.com>
 S:     Maintained
 F:     net/psample
 F:     include/net/psample.h