2.6.14-git12

diff --git a/MAINTAINERS b/MAINTAINERS
index 767fb61..995bfd8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -116,12 +116,6 @@ M:   ajk@iehk.rwth-aachen.de
 L:   linux-hams@vger.kernel.org
 S:   Maintained
 
-YEALINK PHONE DRIVER
-P:   Henk Vergonet
-M:   Henk.Vergonet@gmail.com
-L:   usbb2k-api-dev@nongnu.org
-S:   Maintained
-
 8139CP 10/100 FAST ETHERNET DRIVER
 P:   Jeff Garzik
 M:   jgarzik@pobox.com
@@ -197,6 +191,15 @@ M:   Thorsten Knabe <linux@thorsten-knabe.
 W:   http://linux.thorsten-knabe.de
 S:   Maintained
 
+AD1889 SOUND DRIVER
+P:   Kyle McMartin
+M:   kyle@parisc-linux.org
+P:   Thibaut Varene
+M:   T-Bone@parisc-linux.org
+W:   http://wiki.parisc-linux.org/AD1889
+L:   parisc-linux@lists.parisc-linux.org
+S:   Maintained
+
 ADM1025 HARDWARE MONITOR DRIVER
 P:   Jean Delvare
 M:   khali@linux-fr.org
@@ -294,6 +297,11 @@ P:   Richard Purdie
 M:   rpurdie@rpsys.net
 S:   Maintained
 
+ARM/TOSA MACHINE SUPPORT
+P:   Dirk Opfer
+M:   dirk@opfer-online.de
+S:   Maintained
+
 ARM/PLEB SUPPORT
 P:   Peter Chubb
 M:   pleb@gelato.unsw.edu.au
@@ -907,6 +915,15 @@ L:   linux-fbdev-devel@lists.sourceforge.n
 W:   http://linux-fbdev.sourceforge.net/
 S:   Maintained
 
+FREESCALE SOC FS_ENET DRIVER
+P:   Pantelis Antoniou
+M:   pantelis.antoniou@gmail.com
+P:   Vitaly Bordug
+M:   vbordug@ru.mvista.com
+L:   linuxppc-embedded@ozlabs.org
+L:   netdev@vger.kernel.org
+S:   Maintained
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:   Matthew Wilcox
 M:   matthew@wil.cx
@@ -1060,6 +1077,26 @@ P:   Jaroslav Kysela
 M:   perex@suse.cz
 S:   Maintained
 
+HPET:   High Precision Event Timers driver (hpet.c)
+P:   Clemens Ladisch
+M:   clemens@ladisch.de
+S:   Maintained
+
+HPET:   i386
+P:   Venkatesh Pallipadi (Venki)
+M:   venkatesh.pallipadi@intel.com
+S:   Maintained
+
+HPET:   x86_64
+P:   Andi Kleen and Vojtech Pavlik
+M:   ak@muc.de and vojtech@suse.cz
+S:   Maintained
+
+HPET:   ACPI hpet.c
+P:   Bob Picco
+M:   bob.picco@hp.com
+S:   Maintained
+
 HPFS FILESYSTEM
 P:   Mikulas Patocka
 M:   mikulas@artax.karlin.mff.cuni.cz
@@ -1640,7 +1677,7 @@ S:   Maintained
 MIPS
 P:   Ralf Baechle
 M:   ralf@linux-mips.org
-W:   http://oss.sgi.com/mips/mips-howto.html
+W:   http://www.linux-mips.org/
 L:   linux-mips@linux-mips.org
 S:   Maintained
 
@@ -1942,6 +1979,14 @@ M:   george@mvista.com
 L:   netdev@vger.kernel.org
 S:   Supported
 
+POWERPC 4xx EMAC DRIVER
+P:   Eugene Surovegin
+M:   ebs@ebshome.net
+W:   http://kernel.ebshome.net/emac/
+L:   linuxppc-embedded@ozlabs.org
+L:   netdev@vger.kernel.org
+S:   Maintained
+
 PNP SUPPORT
 P:   Adam Belay
 M:   ambx1@neo.rr.com
@@ -2026,6 +2071,12 @@ P:   Matt Mackall
 M:   mpm@selenic.com
 S:   Maintained
 
+RAPIDIO SUBSYSTEM
+P:   Matt Porter
+M:   mporter@kernel.crashing.org
+L:   linux-kernel@vger.kernel.org
+S:   Maintained
+
 REAL TIME CLOCK DRIVER
 P:   Paul Gortmaker
 M:   p_gortmaker@yahoo.com
@@ -2275,6 +2326,11 @@ W:   http://tpmdd.sourceforge.net
 L:   tpmdd-devel@lists.sourceforge.net
 S:   Maintained
 
+Telecom Clock Driver for MCPL0010
+P: Mark Gross
+M: mark.gross@intel.com
+S: Supported
+
 TENSILICA XTENSA PORT (xtensa):
 P:   Chris Zankel
 M:   chris@zankel.net
@@ -2425,10 +2481,10 @@ L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
 TRIVIAL PATCHES
-P:      Rusty Russell
-M:      trivial@rustcorp.com.au
+P:      Adrian Bunk
+M:      trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
-W:      http://www.kernel.org/pub/linux/kernel/people/rusty/trivial/
+W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
 S:      Maintained
 
 TMS380 TOKEN-RING NETWORK DRIVER
@@ -2486,14 +2542,6 @@ L:   linux-kernel@vger.kernel.org
 L:   linux-usb-devel@lists.sourceforge.net
 S:   Supported
 
-USB BLUETOOTH TTY CONVERTER DRIVER
-P:   Greg Kroah-Hartman
-M:   greg@kroah.com
-L:   linux-usb-users@lists.sourceforge.net
-L:   linux-usb-devel@lists.sourceforge.net
-S:   Maintained
-W:   http://www.kroah.com/linux-usb/
-
 USB CDC ETHERNET DRIVER
 P:   Greg Kroah-Hartman
 M:   greg@kroah.com
@@ -2727,6 +2775,12 @@ P:   Roger Luethi
 M:   rl@hellgate.ch
 S:   Maintained
 
+VIAPRO SMBUS DRIVER
+P:   Jean Delvare
+M:   khali@linux-fr.org
+L:   lm-sensors@lm-sensors.org
+S:   Maintained
+
 UCLINUX (AND M68KNOMMU)
 P:   Greg Ungerer
 M:   gerg@uclinux.org
@@ -2848,6 +2902,12 @@ M:   jpr@f6fbb.org
 L:   linux-hams@vger.kernel.org
 S:   Maintained
 
+YEALINK PHONE DRIVER
+P:   Henk Vergonet
+M:   Henk.Vergonet@gmail.com
+L:   usbb2k-api-dev@nongnu.org
+S:   Maintained
+
 YMFPCI YAMAHA PCI SOUND (Use ALSA instead)
 P:   Pete Zaitcev
 M:   zaitcev@yahoo.com