Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

1 files changed, 27 insertions, 2 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 1978fb205bf7..64c89c215b01 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -765,6 +765,14 @@ L:	linux-wireless@vger.kernel.org
 L:      ath9k-devel@lists.ath9k.org
 S:      Supported
 
+ATHEROS AR9170 WIRELESS DRIVER
+P:      Christian Lamparter
+M:      chunkeey@web.de
+L:      linux-wireless@vger.kernel.org
+W:      http://wireless.kernel.org/en/users/Drivers/ar9170
+S:      Maintained
+F:      drivers/net/wireless/ar9170/
+
 ATI_REMOTE2 DRIVER
 P:      Ville Syrjala
 M:      syrjala@sci.fi
@@ -1011,6 +1019,8 @@ L:	netdev@vger.kernel.org
 S:      Supported
 
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
+P:      Matt Carlson
+M:      mcarlson@broadcom.com
 P:      Michael Chan
 M:      mchan@broadcom.com
 L:      netdev@vger.kernel.org
@@ -2843,7 +2853,7 @@ P:	Roman Zippel
 M:      zippel@linux-m68k.org
 L:      linux-m68k@lists.linux-m68k.org
 W:      http://www.linux-m68k.org/
-W:      http://linux-m68k-cvs.ubb.ca/
+T:      git git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
 S:      Maintained
 
 M68K ON APPLE MACINTOSH
@@ -3600,7 +3610,7 @@ S:	Maintained
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:      rt2x00 project
 L:      linux-wireless@vger.kernel.org
-L:      rt2400-devel@lists.sourceforge.net
+L:      users@rt2x00.serialmonkey.com
 W:      http://rt2x00.serialmonkey.com/
 S:      Maintained
 T:      git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git
@@ -3646,6 +3656,12 @@ M:	florian.fainelli@telecomint.eu
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+RDS - RELIABLE DATAGRAM SOCKETS
+P:      Andy Grover
+M:      andy.grover@oracle.com
+L:      rds-devel@oss.oracle.com
+S:      Supported
+
 READ-COPY UPDATE (RCU)
 P:      Dipankar Sarma
 M:      dipankar@in.ibm.com
@@ -3737,6 +3753,15 @@ L:	linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 
+S390 ZCRYPT DRIVER
+P:      Felix Beck
+M:      felix.beck@de.ibm.com
+P:      Ralph Wuerthner
+M:      ralph.wuerthner@de.ibm.com
+M:      linux390@de.ibm.com
+L:      linux-s390@vger.kernel.org
+S:      Supported
+
 S390 ZFCP DRIVER
 P:      Christof Schmitt
 M:      christof.schmitt@de.ibm.com