Pull ec into release branch

diff --combined MAINTAINERS
index 773c732b4177d85830e150fb9d4a52acc32dfd1f,89b7cc6a1f0aa7a551e66c9fcfe11198020691cd..a9b9ef614ae7d602c05bad2b101583fe8e6a019a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -194,6 -194,13 +194,6 @@@ M:        jes@trained-monkey.or
  L:    linux-acenic@sunsite.dk
  S:    Maintained
  
 -ACI MIXER DRIVER
 -P:    Robert Siemer
 -M:    Robert.Siemer@gmx.de
 -L:    linux-sound@vger.kernel.org
 -W:    http://www.stud.uni-karlsruhe.de/~uh1b/
 -S:    Maintained
 -
  IPS SCSI RAID DRIVER
  P:    Adaptec OEM Raid Solutions
  M:    aacraid@adaptec.com
@@@ -225,15 -232,15 +225,15 @@@ T:      git kernel.org:/pub/scm/linux/kernel
  S:    Supported
  
  ACPI BATTERY DRIVERS
- P:    Vladimir P. Lebedev
- M:    vladimir.p.lebedev@intel.com
+ P:    Alexey Starikovskiy
+ M:    astarikovskiy@suse.de
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
  ACPI EC DRIVER
  P:    Alexey Starikovskiy
- M:    alexey.y.starikovskiy@linux.intel.com
+ M:    astarikovskiy@suse.de
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  S:    Supported
@@@ -265,6 -272,21 +265,6 @@@ L:        linux-acpi@vger.kernel.or
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
 -AD1816 SOUND DRIVER
 -P:    Thorsten Knabe
 -M:    Thorsten Knabe <linux@thorsten-knabe.de>
 -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
@@@ -293,9 -315,10 +293,9 @@@ M:        zippel@linux-m68k.or
  S:    Maintained
  
  AGPGART DRIVER
 -P:    Dave Jones
 -M:    davej@codemonkey.org.uk
 -W:    http://www.codemonkey.org.uk/projects/agp/
 -T:    git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
 +P:    David Airlie
 +M:    airlied@linux.ie
 +T:    git kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
  S:    Maintained
  
  AHA152X SCSI DRIVER
@@@ -329,12 -352,6 +329,12 @@@ P:       Ivan Kokshaysk
  M:    ink@jurassic.park.msu.ru
  S:    Maintained for 2.4; PCI support for 2.6.
  
 +AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 +P:    Thomas Dahlmann
 +M:    thomas.dahlmann@amd.com
 +L:    info-linux@geode.amd.com
 +S:    Supported
 +
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
  P:    Jordan Crouse
  M:    info-linux@geode.amd.com
@@@ -354,7 -371,7 +354,7 @@@ P: Tom Tucke
  M:    tom@opengridcomputing.com
  P:    Steve Wise
  M:    swise@opengridcomputing.com
 -L:    openib-general@openib.org
 +L:    general@lists.openfabrics.org
  S:    Maintained
  
  AOA (Apple Onboard Audio) ALSA DRIVER
@@@ -613,12 -630,6 +613,12 @@@ W:       http://sourceforge.net/projects/acpi
  W:    http://xf.iksaif.net/acpi4asus
  S:    Maintained
  
 +ASUS ASB100 HARDWARE MONITOR DRIVER
 +P:    Mark M. Hoffman
 +M:    mhoffman@lightlink.com
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +
  ASUS LAPTOP EXTRAS DRIVER
  P:    Corentin Chary
  M:    corentincj@iksaif.net
@@@ -651,12 -662,7 +651,12 @@@ W:       http://linux-atm.sourceforge.ne
  S:    Maintained
  
  ATMEL AT91 MCI DRIVER
 -S:    Orphan
 +P:    Nicolas Ferre
 +M:    nicolas.ferre@rfo.atmel.com
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +W:    http://www.atmel.com/products/AT91/
 +W:    http://www.at91.com/
 +S:    Maintained
  
  ATMEL MACB ETHERNET DRIVER
  P:    Haavard Skinnemoen
@@@ -749,13 -755,6 +749,13 @@@ L:       uclinux-dist-devel@blackfin.uclinux.
  W:    http://blackfin.uclinux.org
  S:    Supported
  
 +BLACKFIN EMAC DRIVER
 +P:    Bryan Wu
 +M:    bryan.wu@analog.com
 +L:    uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 +W:    http://blackfin.uclinux.org
 +S:    Supported
 +
  BLACKFIN RTC DRIVER
  P:    Mike Frysinger
  M:    michael.frysinger@analog.com
@@@ -937,12 -936,6 +937,12 @@@ M:       mchan@broadcom.co
  L:    netdev@vger.kernel.org
  S:    Supported
  
 +BSG (block layer generic sg v4 driver)
 +P:    FUJITA Tomonori
 +M:    fujita.tomonori@lab.ntt.co.jp
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +
  BTTV VIDEO4LINUX DRIVER
  P:    Mauro Carvalho Chehab
  M:    mchehab@infradead.org
@@@ -1284,18 -1277,6 +1284,18 @@@ M:    tori@unhappy.mine.n
  L:    netdev@vger.kernel.org
  S:    Maintained
  
 +DMA GENERIC MEMCPY SUBSYSTEM
 +P:    Shannon Nelson
 +M:    shannon.nelson@intel.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
 +DME1737 HARDWARE MONITOR DRIVER
 +P:    Juerg Haefliger
 +M:    juergh@gmail.com
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +
  DOCBOOK FOR DOCUMENTATION
  P:    Randy Dunlap
  M:    rdunlap@xenotime.net
@@@ -1375,60 -1356,21 +1375,60 @@@ S:   Supporte
  
  EDAC-CORE
  P:    Doug Thompson
 -M:    norsk5@xmission.com
 +M:    dougthompson@xmission.com
  L:    bluesmoke-devel@lists.sourceforge.net
  W:    bluesmoke.sourceforge.net
  S:    Supported
  
  EDAC-E752X
  P:    Mark Gross
 +P:    Doug Thompson
  M:    mark.gross@intel.com
 +M:    dougthompson@xmission.com
  L:    bluesmoke-devel@lists.sourceforge.net
  W:    bluesmoke.sourceforge.net
  S:    Maintained
  
  EDAC-E7XXX
  P:    Doug Thompson
 -M:    norsk5@xmission.com
 +M:    dougthompson@xmission.com
 +L:    bluesmoke-devel@lists.sourceforge.net
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +
 +EDAC-I82443BXGX
 +P:    Tim Small
 +M:    tim@buttersideup.com
 +L:    bluesmoke-devel@lists.sourceforge.net
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +
 +EDAC-I3000
 +P:    Jason Uhlenkott
 +M:    juhlenko@akamai.com
 +L:    bluesmoke-devel@lists.sourceforge.net
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +
 +EDAC-I5000
 +P:    Doug Thompson
 +M:    dougthompson@xmission.com
 +L:    bluesmoke-devel@lists.sourceforge.net
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +
 +EDAC-I82975X
 +P:    Ranganathan Desikan
 +P:    Arvind R.
 +M:    rdesikan@jetzbroadband.com
 +M:    arvind@acarlab.com
 +L:    bluesmoke-devel@lists.sourceforge.net
 +W:    bluesmoke.sourceforge.net
 +S:    Maintained
 +
 +EDAC-PASEMI
 +P:    Egor Martovetsky
 +M:    egor@pasemi.com
  L:    bluesmoke-devel@lists.sourceforge.net
  W:    bluesmoke.sourceforge.net
  S:    Maintained
@@@ -1454,9 -1396,16 +1454,9 @@@ P:     Hoang-Nam Nguye
  M:    hnguyen@de.ibm.com
  P:    Christoph Raisch
  M:    raisch@de.ibm.com
 -L:    openib-general@openib.org
 +L:    general@lists.openfabrics.org
  S:    Supported
  
 -EMU10K1 SOUND DRIVER
 -P:    James Courtier-Dutton
 -M:    James@superbug.demon.co.uk
 -L:    emu10k1-devel@lists.sourceforge.net
 -W:    http://sourceforge.net/projects/emu10k1/
 -S:    Maintained
 -
  EMULEX LPFC FC SCSI DRIVER
  P:    James Smart
  M:    james.smart@emulex.com
@@@ -1646,11 -1595,11 +1646,11 @@@ W:   http://gigaset307x.sourceforge.net
  S:    Maintained
  
  HARDWARE MONITORING
 -P:    Jean Delvare
 -M:    khali@linux-fr.org
 +P:    Mark M. Hoffman
 +M:    mhoffman@lightlink.com
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
 -T:    quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/
 +T:    git lm-sensors.org:/kernel/mhoffman/hwmon-2.6.git
  S:    Maintained
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
@@@ -1786,12 -1735,6 +1786,12 @@@ P:    William Irwi
  M:    wli@holomorphy.com
  S:    Maintained
  
 +I2C/SMBUS STUB DRIVER
 +P:    Mark M. Hoffman
 +M:    mhoffman@lightlink.com
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +
  I2C SUBSYSTEM
  P:    Jean Delvare
  M:    khali@linux-fr.org
@@@ -1807,15 -1750,14 +1807,15 @@@ T:   http://www.harbaum.org/till/i2c_tiny
  S:    Maintained
  
  i386 BOOT CODE
 -P:    Riley H. Williams
 -M:    Riley@Williams.Name
 +P:    H. Peter Anvin
 +M:    hpa@zytor.com
  L:    Linux-Kernel@vger.kernel.org
  S:    Maintained
  
  i386 SETUP CODE / CPU ERRATA WORKAROUNDS
  P:    H. Peter Anvin
  M:    hpa@zytor.com
 +T:    git.kernel.org:/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git
  S:    Maintained
  
  IA64 (Itanium) PLATFORM
@@@ -1908,13 -1850,13 +1908,13 @@@ M:   rolandd@cisco.co
  P:    Sean Hefty
  M:    mshefty@ichips.intel.com
  P:    Hal Rosenstock
 -M:    halr@voltaire.com
 -L:    openib-general@openib.org
 +M:    hal.rosenstock@gmail.com 
 +L:    general@lists.openfabrics.org
  W:    http://www.openib.org/
  T:    git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
  S:    Supported
  
 -INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS
 +INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
  P:    Dmitry Torokhov
  M:    dmitry.torokhov@gmail.com
  M:    dtor@mail.ru
@@@ -1959,12 -1901,6 +1959,12 @@@ P:    Tigran Aivazia
  M:    tigran@aivazian.fsnet.co.uk
  S:    Maintained
  
 +INTEL I/OAT DMA DRIVER
 +P:    Shannon Nelson
 +M:    shannon.nelson@intel.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +
  INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
  P:    Deepak Saxena
  M:    dsaxena@plexity.net
@@@ -2053,10 -1989,9 +2053,10 @@@ M:    jjciarla@raiz.uncu.edu.a
  S:    Maintained
  
  IPATH DRIVER:
 -P:    Bryan O'Sullivan
 -M:    support@pathscale.com
 -L:    openib-general@openib.org
 +P:    Arthur Jones
 +M:    infinipath@qlogic.com
 +L:    general@lists.openfabrics.org
 +T:    git git://git.qlogic.com/ipath-linux-2.6
  S:    Supported
  
  IPMI SUBSYSTEM
@@@ -2166,7 -2101,7 +2166,7 @@@ S:      Maintaine
  
  KERNEL JANITORS
  P:    Several
 -L:    kernel-janitors@lists.linux-foundation.org
 +L:    kernel-janitors@vger.kernel.org
  W:    http://www.kerneljanitors.org/
  S:    Maintained
  
@@@ -2362,14 -2297,6 +2362,14 @@@ M:    matthew@wil.c
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 +M32R ARCHITECTURE
 +P:    Hirokazu Takata
 +M:    takata@linux-m32r.org
 +L:    linux-m32r@ml.linux-m32r.org
 +L:    linux-m32r-ja@ml.linux-m32r.org (in Japanese)
 +W:    http://www.linux-m32r.org/
 +S:    Maintained
 +
  M68K ARCHITECTURE
  P:    Geert Uytterhoeven
  M:    geert@linux-m68k.org
@@@ -2403,12 -2330,6 +2403,12 @@@ W:    http://linuxwireless.org
  T:    git kernel.org:/pub/scm/linux/kernel/git/jbenc/mac80211.git
  S:    Maintained
  
 +MACVLAN DRIVER
 +P:    Patrick McHardy
 +M:    kaber@trash.net
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +
  MARVELL YUKON / SYSKONNECT DRIVER
  P:    Mirko Lindner
  M:    mlindner@syskonnect.de
@@@ -2469,7 -2390,7 +2469,7 @@@ P:      Artem Bityutski
  M:    dedekind@infradead.org
  W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
 -T:    git git://git.infradead.org/ubi-2.6.git
 +T:    git git://git.infradead.org/~dedekind/ubi-2.6.git
  S:    Maintained
  
  MICROTEK X6 SCANNER
@@@ -2695,6 -2616,12 +2695,6 @@@ M:     yokota@netlab.is.tsukuba.ac.j
  W:    http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
  S:    Maintained
  
 -NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
 -P:    Eberhard Moenkeberg
 -M:    emoenke@gwdg.de
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -
  NTFS FILESYSTEM
  P:    Anton Altaparmakov
  M:    aia21@cantab.net
@@@ -2777,6 -2704,12 +2777,6 @@@ L:     osst-users@lists.sourceforge.ne
  L:    linux-scsi@vger.kernel.org
  S:    Maintained
  
 -OPL3-SA2, SA3, and SAx DRIVER
 -P:    Zwane Mwaikambo
 -M:    zwane@arm.linux.org.uk
 -L:    linux-sound@vger.kernel.org
 -S:    Maintained
 -
  OPROFILE
  P:    Philippe Elie
  M:    phil.el@wanadoo.fr
@@@ -2881,6 -2814,11 +2881,6 @@@ P:     Kristen Carlson Accard
  M:    kristen.c.accardi@intel.com
  S:    Supported
  
 -PCI HOTPLUG COMPAQ DRIVER
 -P:    Greg Kroah-Hartman
 -M:    greg@kroah.com
 -S:    Maintained
 -
  PCIE HOTPLUG DRIVER
  P:    Kristen Carlson Accardi
  M:    kristen.c.accardi@intel.com
@@@ -2925,21 -2863,11 +2925,21 @@@ L:   linux-kernel@vger.kernel.or
  S:    Maintained
  
  POSIX CLOCKS and TIMERS
 -P:    George Anzinger
 -M:    george@mvista.com
 +P:    Thomas Gleixner
 +M:    tglx@linutronix.de
  L:    linux-kernel@vger.kernel.org
  S:    Supported
  
 +POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
 +P:    Anton Vorontsov
 +M:    cbou@mail.ru
 +P:    David Woodhouse
 +M:    dwmw2@infradead.org
 +L:    linux-kernel@vger.kernel.org
 +L:    kernel-discuss@handhelds.org
 +T:    git git.infradead.org/battery-2.6.git
 +S:    Maintained
 +
  POWERPC 4xx EMAC DRIVER
  P:    Eugene Surovegin
  M:    ebs@ebshome.net
@@@ -2975,11 -2903,6 +2975,11 @@@ P:    Michal Ostrowsk
  M:    mostrows@speakeasy.net
  S:    Maintained
  
 +PPP OVER L2TP
 +P:    James Chapman
 +M:    jchapman@katalix.com
 +S:    Maintained
 +
  PREEMPTIBLE KERNEL
  P:    Robert Love
  M:    rml@tech9.net
@@@ -3007,13 -2930,6 +3007,13 @@@ M:    mikpe@it.uu.s
  L:    linux-ide@vger.kernel.org
  S:    Maintained
  
 +PS3 NETWORK SUPPORT
 +P:    Masakazu Mokuno
 +M:    mokuno@sm.sony.co.jp
 +L:    netdev@vger.kernel.org
 +L:    cbe-oss-dev@ozlabs.org
 +S:    Supported
 +
  PS3 PLATFORM SUPPORT
  P:    Geoff Levand
  M:    geoffrey.levand@am.sony.com
@@@ -3133,16 -3049,6 +3133,16 @@@ S:    Maintaine
  RISCOM8 DRIVER
  S:    Orphan
  
 +RTL818X WIRELESS DRIVER
 +P:    Michael Wu
 +M:    flamingice@sourmilk.net
 +P:    Andrea Merello
 +M:    andreamrl@tiscali.it
 +L:    linux-wireless@vger.kernel.org
 +W:    http://linuxwireless.org/
 +T:    git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
 +S:    Maintained
 +
  S3 SAVAGE FRAMEBUFFER DRIVER
  P:    Antonino Daplas
  M:    adaplas@gmail.com
@@@ -3181,6 -3087,12 +3181,6 @@@ M:     michael@mihu.d
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  
 -SBPCD CDROM DRIVER
 -P:    Eberhard Moenkeberg
 -M:    emoenke@gwdg.de
 -L:    linux-kernel@vger.kernel.org
 -S:    Maintained
 -
  SC1200 WDT DRIVER
  P:    Zwane Mwaikambo
  M:    zwane@arm.linux.org.uk
@@@ -3321,12 -3233,6 +3321,12 @@@ W:    http://www.brownhat.org/sis900.htm
  L:    netdev@vger.kernel.org
  S:    Maintained
  
 +SIS 96X I2C/SMBUS DRIVER
 +P:    Mark M. Hoffman
 +M:    mhoffman@lightlink.com
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +
  SIS FRAMEBUFFER DRIVER
  P:    Thomas Winischhofer
  M:    thomas@winischhofer.net
@@@ -3344,12 -3250,6 +3344,12 @@@ P:    Nicolas Pitr
  M:    nico@cam.org
  S:    Maintained
  
 +SMSC47B397 HARDWARE MONITOR DRIVER
 +P:    Mark M. Hoffman
 +M:    mhoffman@lightlink.com
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +
  SOFTMAC LAYER (IEEE 802.11)
  P:    Johannes Berg
  M:    johannes@sipsolutions.net
@@@ -3369,19 -3269,9 +3369,19 @@@ M:    neilb@suse.d
  L:    linux-raid@vger.kernel.org
  S:    Supported
  
 -SOFTWARE SUSPEND:
 +HIBERNATION (aka Software Suspend, aka swsusp):
 +P:    Pavel Machek
 +M:    pavel@suse.cz
 +P:    Rafael J. Wysocki
 +M:    rjw@sisk.pl
 +L:    linux-pm@lists.linux-foundation.org
 +S:    Supported
 +
 +SUSPEND TO RAM:
  P:    Pavel Machek
  M:    pavel@suse.cz
 +P:    Rafael J. Wysocki
 +M:    rjw@sisk.pl
  L:    linux-pm@lists.linux-foundation.org
  S:    Maintained
  
@@@ -3728,7 -3618,7 +3728,7 @@@ W:      http://www.kroah.com/linux-usb
  USB DAVICOM DM9601 DRIVER
  P:    Peter Korsgaard
  M:    jacmet@sunsite.dk
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:    netdev@vger.kernel.org
  W:    http://www.linux-usb.org/usbnet
  S:    Maintained
  
@@@ -3812,23 -3702,23 +3812,23 @@@ S:   Maintaine
  USB PEGASUS DRIVER
  P:    Petko Manolov
  M:    petkan@users.sourceforge.net
 -L:    linux-usb-users@lists.sourceforge.net
  L:    linux-usb-devel@lists.sourceforge.net
 +L:    netdev@vger.kernel.org
  W:    http://pegasus2.sourceforge.net/
  S:    Maintained
  
 -USB PRINTER DRIVER
 -P:    Vojtech Pavlik
 -M:    vojtech@suse.cz
 +USB PRINTER DRIVER (usblp)
 +P:    Pete Zaitcev
 +M:    zaitcev@redhat.com
  L:    linux-usb-users@lists.sourceforge.net
  L:    linux-usb-devel@lists.sourceforge.net
 -S:    Maintained
 +S:    Supported
  
  USB RTL8150 DRIVER
  P:    Petko Manolov
  M:    petkan@users.sourceforge.net
 -L:    linux-usb-users@lists.sourceforge.net
  L:    linux-usb-devel@lists.sourceforge.net
 +L:    netdev@vger.kernel.org
  W:    http://pegasus2.sourceforge.net/
  S:    Maintained
  
@@@ -3939,7 -3829,7 +3939,7 @@@ S:      Maintaine
  USB "USBNET" DRIVER FRAMEWORK
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net
 -L:    linux-usb-devel@lists.sourceforge.net
 +L:    netdev@vger.kernel.org
  W:    http://www.linux-usb.org/usbnet
  S:    Maintained
  
@@@ -4208,11 -4098,6 +4208,11 @@@ W:    http://www.polyware.nl/~middelin/En/
  W:    http://www.polyware.nl/~middelin/hobbies.html
  S:    Maintained
  
 +ZS DECSTATION Z85C30 SERIAL DRIVER
 +P:    Maciej W. Rozycki
 +M:    macro@linux-mips.org
 +S:    Maintained
 +
  THE REST
  P:    Linus Torvalds
  S:    Buried alive in reporters