diff --git a/[refs] b/[refs] index cd9f5e600fde..76819f0a09c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ca17dfbdcaf3def764e72751619b1cc2c9760b9 +refs/heads/master: 48f6e8990858fc9a0ca7d3c9347e6774eb941dba diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index c3b215970f7b..686b3dde9353 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3177,18 +3177,12 @@ P: Paul Clements M: Paul.Clements@steeleye.com S: Maintained -NETWORK DEVICE DRIVERS -P: Jeff Garzik -M: jgarzik@pobox.com -L: netdev@vger.kernel.org -T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git -S: Maintained - NETWORKING [GENERAL] -P: Networking Team -M: netdev@vger.kernel.org +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 S: Maintained NETWORKING [IPv4/IPv6]