Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/core/dev.c

1 files changed, 9 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index cb44e1cb076a..2dc197c362b3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3920,8 +3920,8 @@ NETWORKING [GENERAL]
 P:      David S. Miller
 M:      davem@davemloft.net
 L:      netdev@vger.kernel.org
-W:      http://linux-net.osdl.org/
-T:      git kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git
+W:      http://www.linuxfoundation.org/en/Net
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:      Maintained
 F:      net/
 F:      include/net/
@@ -3962,6 +3962,13 @@ F:	net/wireless/
 F:      include/net/ieee80211*
 F:      include/net/wireless.h
 
+NETWORKING DRIVERS
+L:      netdev@vger.kernel.org
+W:      http://www.linuxfoundation.org/en/Net
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
+S:      Odd Fixes
+F:      drivers/net/
+
 NETXEN (1/10) GbE SUPPORT
 P:      Dhananjay Phadke
 M:      dhananjay@netxen.com