Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Fri, 17 Apr 2009 00:35:26 +0000 (17:35 -0700)]
1  2 
MAINTAINERS
drivers/net/fec.c
drivers/net/ixgbe/ixgbe_82598.c
drivers/net/ixgbe/ixgbe_82599.c
drivers/net/ixgbe/ixgbe_common.c
drivers/net/ixgbe/ixgbe_main.c
net/8021q/vlan_core.c
net/core/dev.c

diff --cc MAINTAINERS
@@@ -3729,8 -4600,9 +4600,9 @@@ F:      drivers/net/r6040.
  RDS - RELIABLE DATAGRAM SOCKETS
  P:    Andy Grover
  M:    andy.grover@oracle.com
 -L:    rds-devel@oss.oracle.com
 +L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
  S:    Supported
+ F:    net/rds/
  
  READ-COPY UPDATE (RCU)
  P:    Dipankar Sarma
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge