Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8d3a91f..0ab47e7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4523,9 +4523,10 @@ S:       Supported
 F:     drivers/net/benet/
 
 SFC NETWORK DRIVER
-P:     Steve Hodgson
-P:     Ben Hutchings
-M:     Robert Stonehouse <linux-net-drivers@solarflare.com>
+M:     Solarflare linux maintainers <linux-net-drivers@solarflare.com>
+M:     Steve Hodgson <shodgson@solarflare.com>
+M:     Ben Hutchings <bhutchings@solarflare.com>
+L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/sfc/