Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge

[mirror_ubuntu-artful-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ae563fad227163eb266a3a28c579fb50952d4eaa..573cfa3091ca6441e598c192081820dfe28fcfd1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4279,8 +4279,8 @@ S:        Maintained
 F:     drivers/usb/musb/
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
+M:     Jon Mason <mason@myri.com>
 M:     Andrew Gallatin <gallatin@myri.com>
-M:     Brice Goglin <brice@myri.com>
 L:     netdev@vger.kernel.org
 W:     http://www.myri.com/scs/download-Myri10GE.html
 S:     Supported