tg3: Cleanup tg3_alloc_rx_skb()

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index e967aadddfc6eb851e79d8fe0e2d78aade12c6d8..ba8603ce4441469c6f94ac3fc7a19186c4e7cd5f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4565,6 +4565,14 @@ L:       linux-abi-devel@lists.sourceforge.net
 S:     Maintained
 F:     include/linux/personality.h
 
+PHONET PROTOCOL
+M:     Remi Denis-Courmont <remi.denis-courmont@nokia.com>
+S:     Supported
+F:     Documentation/networking/phonet.txt
+F:     include/linux/phonet.h
+F:     include/net/phonet/
+F:     net/phonet/
+
 PHRAM MTD DRIVER
 M:     Joern Engel <joern@lazybastard.org>
 L:     linux-mtd@lists.infradead.org
@@ -6457,7 +6465,7 @@ WL1271 WIRELESS DRIVER
 M:     Luciano Coelho <luciano.coelho@nokia.com>
 L:     linux-wireless@vger.kernel.org
 W:     http://wireless.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
 S:     Maintained
 F:     drivers/net/wireless/wl12xx/wl1271*
 F:     include/linux/wl12xx.h