From: David S. Miller <davem@davemloft.net>
Date: Fri, 17 Apr 2009 00:35:26 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.31-rc1~330^2~615
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a54bfa40fd16aeb90bc556189221576f746f8567;p=thirdparty%2Flinux.git

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

a54bfa40fd16aeb90bc556189221576f746f8567
diff --cc MAINTAINERS
index 28421c22ebae9,abedca58d8bd3..cb44e1cb076a2
--- a/MAINTAINERS
+++ b/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