ipv6: remove duplicate neigh_ifdown

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f16ce8f..f5630a5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1264,6 +1264,15 @@ S:       Maintained
 F:     drivers/video/backlight/
 F:     include/linux/backlight.h
 
+BATMAN ADVANCED
+M:     Marek Lindner <lindner_marek@yahoo.de>
+M:     Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
+M:     Sven Eckelmann <sven@narfation.org>
+L:     b.a.t.m.a.n@lists.open-mesh.org
+W:     http://www.open-mesh.org/
+S:     Maintained
+F:     net/batman-adv/
+
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
 M:     Thomas Sailer <t.sailer@alumni.ethz.ch>
 L:     linux-hams@vger.kernel.org
@@ -5934,7 +5943,6 @@ F:        include/linux/tty.h
 
 TULIP NETWORK DRIVERS
 M:     Grant Grundler <grundler@parisc-linux.org>
-M:     Kyle McMartin <kyle@mcmartin.ca>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/tulip/