2.6.25-git12

diff --git a/MAINTAINERS b/MAINTAINERS
index e467758..c1dd1ae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -486,6 +486,12 @@ M:   kernel@wantstofly.org
 L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:   Maintained
 
+ARM/GUMSTIX MACHINE SUPPORT
+P:   Steve Sakoman
+M:   sakoman@gmail.com
+L:   linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:   Maintained
+
 ARM/HP JORNADA 7XX MACHINE SUPPORT
 P:      Kristoffer Ericson
 M:      kristoffer.ericson@gmail.com
@@ -678,6 +684,11 @@ L:   linux-wireless@vger.kernel.org
 L:   ath5k-devel@lists.ath5k.org
 S:   Maintained
 
+ATI_REMOTE2 DRIVER
+P:   Ville Syrjala
+M:   syrjala@sci.fi
+S:   Maintained
+
 ATL1 ETHERNET DRIVER
 P:   Jay Cliburn
 M:   jcliburn@gmail.com
@@ -840,15 +851,6 @@ L:   linux-wireless@vger.kernel.org
 W:   http://linuxwireless.org/en/users/Drivers/b43
 S:   Maintained
 
-BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
-P:   Larry Finger
-M:   Larry.Finger@lwfinger.net
-P:   Stefano Brivio
-M:   stefano.brivio@polimi.it
-L:   linux-wireless@vger.kernel.org
-W:   http://bcm43xx.berlios.de/
-S:   Obsolete
-
 BEFS FILE SYSTEM
 P:   Sergey S. Kostyliov
 M:   rathamahata@php4.ru
@@ -1104,6 +1106,12 @@ M:   kernel@wantstofly.org
 L:   linux-usb@vger.kernel.org
 S:   Maintained
 
+CIRRUS LOGIC CS4270 SOUND DRIVER
+P:   Timur Tabi
+M:   timur@freescale.com
+L:   alsa-devel@alsa-project.org
+S:   Supported
+
 CIRRUS LOGIC CS4280/CS461x SOUNDDRIVER
 P:   Cirrus Logic Corporation (kernel 2.2 driver)
 M:   Cirrus Logic Corporation, Thomas Woller <twoller@crystal.cirrus.com>
@@ -1626,6 +1634,12 @@ L:   linuxppc-dev@ozlabs.org
 L:   netdev@vger.kernel.org
 S:   Maintained
 
+FREESCALE QUICC ENGINE LIBRARY
+P:   Timur Tabi
+M:   timur@freescale.com
+L:   linuxppc-dev@ozlabs.org
+S:   Supported
+
 FREESCALE HIGHSPEED USB DEVICE DRIVER
 P:   Li Yang
 M:   leoli@freescale.com
@@ -1640,6 +1654,19 @@ L:   netdev@vger.kernel.org
 L:   linuxppc-dev@ozlabs.org
 S:   Maintained
 
+FREESCALE QUICC ENGINE UCC UART DRIVER
+P:   Timur Tabi
+M:   timur@freescale.com
+L:   linuxppc-dev@ozlabs.org
+S:   Supported
+
+FREESCALE SOC SOUND DRIVERS
+P:   Timur Tabi
+M:   timur@freescale.com
+L:   alsa-devel@alsa-project.org
+L:   linuxppc-dev@ozlabs.org
+S:   Supported
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:   Matthew Wilcox
 M:   matthew@wil.cx
@@ -2302,6 +2329,13 @@ L:   kvm-devel@lists.sourceforge.net
 W:   kvm.sourceforge.net
 S:   Supported
 
+KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC
+P:   Hollis Blanchard
+M:   hollisb@us.ibm.com
+L:   kvm-ppc-devel@lists.sourceforge.net
+W:   kvm.sourceforge.net
+S:   Supported
+
 KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64)
 P:   Anthony Xu
 M:   anthony.xu@intel.com
@@ -2311,6 +2345,16 @@ L:   kvm-ia64-devel@lists.sourceforge.net
 W:   kvm.sourceforge.net
 S:   Supported
 
+KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
+P:   Carsten Otte
+M:   cotte@de.ibm.com
+P:   Christian Borntraeger
+M:   borntraeger@de.ibm.com
+M:   linux390@de.ibm.com
+L:   linux-s390@vger.kernel.org
+W:   http://www.ibm.com/developerworks/linux/linux390/
+S:   Supported
+
 KEXEC
 P:   Eric Biederman
 M:   ebiederm@xmission.com
@@ -2319,6 +2363,12 @@ L:   linux-kernel@vger.kernel.org
 L:   kexec@lists.infradead.org
 S:   Maintained
 
+KGDB
+P:   Jason Wessel
+M:   jason.wessel@windriver.com
+L:   kgdb-bugreport@lists.sourceforge.net
+S:   Maintained
+
 KPROBES
 P:   Ananth N Mavinakayanahalli
 M:   ananth@in.ibm.com
@@ -2550,12 +2600,10 @@ W:   http://www.tazenda.demon.co.uk/phil/linux-hp
 S:   Maintained
 
 MAC80211
-P:   Michael Wu
-M:   flamingice@sourmilk.net
 P:   Johannes Berg
 M:   johannes@sipsolutions.net
-P:   Jiri Benc
-M:   jbenc@suse.cz
+P:   Michael Wu
+M:   flamingice@sourmilk.net
 L:   linux-wireless@vger.kernel.org
 W:   http://linuxwireless.org/
 T:   git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -2944,8 +2992,9 @@ P:   Mark Fasheh
 M:   mfasheh@suse.com
 P:   Joel Becker
 M:   joel.becker@oracle.com
-L:   ocfs2-devel@oss.oracle.com
+L:   ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:   http://oss.oracle.com/projects/ocfs2/
+T:   git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
 S:   Supported
 
 OMNIKEY CARDMAN 4000 DRIVER
@@ -3061,11 +3110,10 @@ L:   linux-pci@atrey.karlin.mff.cuni.cz
 S:   Supported
 
 PCI SUBSYSTEM
-P:   Greg Kroah-Hartman
-M:   gregkh@suse.de
+P:   Jesse Barnes
+M:   jbarnes@virtuousgeek.org
 L:   linux-kernel@vger.kernel.org
 L:   linux-pci@atrey.karlin.mff.cuni.cz
-T:   quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
 S:   Supported
 
 PCI HOTPLUG CORE
@@ -3472,7 +3520,7 @@ P:   Vlad Yasevich
 M:   vladislav.yasevich@hp.com
 P:   Sridhar Samudrala
 M:   sri@us.ibm.com
-L:   lksctp-developers@lists.sourceforge.net
+L:   linux-sctp@vger.kernel.org
 W:   http://lksctp.sourceforge.net
 S:   Supported
 
@@ -3606,11 +3654,10 @@ M:   mhoffman@lightlink.com
 L:   lm-sensors@lm-sensors.org
 S:   Maintained
 
-SOFTMAC LAYER (IEEE 802.11)
-P:   Daniel Drake
-M:   dsd@gentoo.org
-L:   linux-wireless@vger.kernel.org
-S:   Obsolete
+SMX UIO Interface
+P:   Ben Nizette
+M:   bn@niasdigital.com
+S:   Maintained
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:   Ingo Molnar
@@ -4351,6 +4398,16 @@ L:   linux-wireless@vger.kernel.org
 W:   http://oops.ghostprotocols.net:81/blog
 S:   Maintained
 
+WM97XX TOUCHSCREEN DRIVERS
+P:   Mark Brown
+M:   broonie@opensource.wolfsonmicro.com
+P:   Liam Girdwood
+M:   liam.girdwood@wolfsonmicro.com
+L:   linux-input@vger.kernel.org
+T:   git git://opensource.wolfsonmicro.com/linux-2.6-touch
+W:   http://opensource.wolfsonmicro.com/node/7
+S:   Supported
+
 X.25 NETWORK LAYER
 P:   Henner Eisen
 M:   eis@baty.hanse.de