Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...

diff --combined MAINTAINERS
index fb94addb34de463ec8c4af59d1b5861d04fd1e6b,ad716d00bdfb75816fb8e457431277c185b32982..acd124f8000d84d60b59b0cb179c83d6f6673ee3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -36,12 -36,6 +36,12 @@@ trivial patch so apply some common sens
        (scripts/checkpatch.pl) to catch trival style violations.
        See Documentation/CodingStyle for guidance here.
  
 +      PLEASE CC: the maintainers and mailing lists that are generated
 +      by scripts/get_maintainer.pl.  The results returned by the
 +      script will be best if you have git installed and are making
 +      your changes in a branch derived from Linus' latest git tree.
 +      See Documentation/SubmittingPatches for details.
 +
        PLEASE try to include any credit lines you want added with the
        patch. It avoids people being missed off by mistake and makes
        it easier to know who wants adding and who doesn't.
@@@ -77,7 -71,7 +77,7 @@@ P: Perso
  M: Mail patches to
  L: Mailing list that is relevant to this area
  W: Web-page with status/info
 -T: SCM tree type and location.  Type is one of: git, hg, quilt.
 +T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit.
  S: Status, one of the following:
  
        Supported:      Someone is actually paid to look after this.
@@@ -163,11 -157,9 +163,11 @@@ S:       Maintaine
  F:    drivers/net/r8169.c
  
  8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
 +P:    Alan Cox
 +M:    alan@lxorguk.ukuu.org.uk
  L:    linux-serial@vger.kernel.org
  W:    http://serial.sourceforge.net
 -S:    Orphan
 +S:    Odd Fixes
  F:    drivers/serial/8250*
  F:    include/linux/serial_8250.h
  
@@@ -495,7 -487,7 +495,7 @@@ AOA (Apple Onboard Audio) ALSA DRIVE
  P:    Johannes Berg
  M:    johannes@sipsolutions.net
  L:    linuxppc-dev@ozlabs.org
 -L:    alsa-devel@alsa-project.org (subscribers-only)
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Maintained
  F:    sound/aoa/
  
@@@ -653,6 -645,8 +653,8 @@@ M: laforge@openezx.or
  L:    openezx-devel@lists.openezx.org (subscribers-only)
  W:    http://www.openezx.org/
  S:    Maintained
+ T:    topgit git://git.openezx.org/openezx.git
+ F:    arch/arm/mach-pxa/ezx.c
  
  ARM/FARADAY FA526 PORT
  P:    Paulius Zaleckas
@@@ -774,6 -768,13 +776,13 @@@ P:       Philipp Zabe
  M:    philipp.zabel@gmail.com
  S:    Maintained
  
+ ARM/MIOA701 MACHINE SUPPORT
+ P:    Robert Jarzmik
+ M:    robert.jarzmik@free.fr
+ L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+ F:    arch/arm/mach-pxa/mioa701.c
+ S:    Maintained
+ 
  ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
  P:    Michael Petchkovsky
  M:    mkpetch@internode.on.net
@@@ -792,6 -793,12 +801,12 @@@ M:       marek.vasut@gmail.co
  W:    http://hackndev.com
  S:    Maintained
  
+ ARM/PALM TREO 680 SUPPORT
+ P:    Tomas Cech
+ M:    sleep_walker@suse.cz
+ W:    http://hackndev.com
+ S:    Maintained
+ 
  ARM/PALMZ72 SUPPORT
  P:    Sergey Lapin
  M:    slapin@ossfans.org
@@@ -918,6 -925,7 +933,6 @@@ P: Dan William
  M:    dan.j.williams@intel.com
  P:    Maciej Sosnowski
  M:    maciej.sosnowski@intel.com
 -L:    linux-kernel@vger.kernel.org
  W:    http://sourceforge.net/projects/xscaleiop
  S:    Supported
  F:    Documentation/crypto/async-tx-api.txt
@@@ -953,12 -961,6 +968,12 @@@ P:       Luis R. Rodrigue
  M:    lrodriguez@atheros.com
  P:    Jouni Malinen
  M:    jmalinen@atheros.com
 +P:    Sujith Manoharan
 +M:    Sujith.Manoharan@atheros.com
 +P:    Vasanthakumar Thiagarajan
 +M:    vasanth@atheros.com
 +P:    Senthil Balasubramanian
 +M:    senthilkumar@atheros.com
  L:    linux-wireless@vger.kernel.org
  L:    ath9k-devel@lists.ath9k.org
  S:    Supported
@@@ -1013,6 -1015,7 +1028,6 @@@ F:      drivers/mmc/host/at91_mci.
  ATMEL AT91 / AT32 SERIAL DRIVER
  P:    Haavard Skinnemoen
  M:    hskinnemoen@atmel.com
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    drivers/serial/atmel_serial.c
  
@@@ -1068,6 -1071,7 +1083,6 @@@ F:      kernel/audit
  AUXILIARY DISPLAY DRIVERS
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
 -L:    linux-kernel@vger.kernel.org
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -1137,6 -1141,7 +1152,6 @@@ F:      drivers/net/hamradio/baycom
  BEFS FILE SYSTEM
  P:    Sergey S. Kostyliov
  M:    rathamahata@php4.ru
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/befs.txt
  F:    fs/befs/
@@@ -1144,6 -1149,7 +1159,6 @@@
  BFS FILE SYSTEM
  P:    Tigran A. Aivazian
  M:    tigran@aivazian.fsnet.co.uk
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/bfs.txt
  F:    fs/bfs/
@@@ -1200,6 -1206,7 +1215,6 @@@ F:      drivers/i2c/busses/i2c-bfin-twi.
  BLOCK LAYER
  P:    Jens Axboe
  M:    axboe@kernel.dk
 -L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
  S:    Maintained
  F:    block/
@@@ -1326,6 -1333,7 +1341,6 @@@ P:      Muli Ben-Yehud
  M:    muli@il.ibm.com
  P:    Jon D. Mason
  M:    jdmason@kudzu.us
 -L:    linux-kernel@vger.kernel.org
  L:    discuss@x86-64.org
  S:    Maintained
  F:    arch/x86/kernel/pci-calgary_64.c
@@@ -1345,13 -1353,6 +1360,13 @@@ F:    drivers/net/can
  F:    include/linux/can/
  F:    include/linux/can.h
  
 +CAN NETWORK DRIVERS
 +P:    Wolfgang Grandegger
 +M:    wg@grandegger.com
 +L:    socketcan-core@lists.berlios.de (subscribers-only)
 +W:    http://developer.berlios.de/projects/socketcan/
 +S:    Maintained
 +
  CELL BROADBAND ENGINE ARCHITECTURE
  P:    Arnd Bergmann
  M:    arnd@arndb.de
@@@ -1377,6 -1378,7 +1392,6 @@@ F:      include/linux/usb/wusb
  CFAG12864B LCD DRIVER
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
 -L:    linux-kernel@vger.kernel.org
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -1386,6 -1388,7 +1401,6 @@@ F:      include/linux/cfag12864b.
  CFAG12864BFB LCD FRAMEBUFFER DRIVER
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
 -L:    linux-kernel@vger.kernel.org
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -1405,6 -1408,7 +1420,6 @@@ X:      net/wireless/wext
  CHECKPATCH
  P:    Andy Whitcroft
  M:    apw@canonical.com
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    scripts/checkpatch.pl
  
@@@ -1433,7 -1437,7 +1448,7 @@@ F:      drivers/usb/host/ohci-ep93xx.
  CIRRUS LOGIC CS4270 SOUND DRIVER
  P:    Timur Tabi
  M:    timur@freescale.com
 -L:    alsa-devel@alsa-project.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/codecs/cs4270*
  
@@@ -1458,7 -1462,6 +1473,7 @@@ P:      Joe Eykhol
  M:    jeykholt@cisco.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
 +F:    drivers/scsi/fnic/
  
  CODA FILE SYSTEM
  P:    Jan Harkes
@@@ -1531,6 -1534,7 +1546,6 @@@ F:      drivers/usb/atm/cxacru.
  CONFIGFS
  P:    Joel Becker
  M:    joel.becker@oracle.com
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    fs/configfs/
  F:    include/linux/configfs.h
@@@ -1588,6 -1592,7 +1603,6 @@@ F:      arch/x86/kernel/msr.
  CPUSETS
  P:    Paul Menage
  M:    menage@google.com
 -L:    linux-kernel@vger.kernel.org
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
  S:    Supported
@@@ -1794,6 -1799,7 +1809,6 @@@ DEVICE NUMBER REGISTR
  P:    Torben Mathiasen
  M:    device@lanana.org
  W:    http://lanana.org/docs/device-list/index.html
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
  DEVICE-MAPPER  (LVM)
@@@ -1817,9 -1823,10 +1832,9 @@@ F:     drivers/char/epca
  F:    drivers/char/digi*
  
  DIRECTORY NOTIFICATION (DNOTIFY)
 -P:    Stephen Rothwell
 -M:    sfr@canb.auug.org.au
 -L:    linux-kernel@vger.kernel.org
 -S:    Supported
 +P:    Eric Paris
 +M:    eparis@parisplace.org
 +S:    Maintained
  F:    Documentation/filesystems/dnotify.txt
  F:    fs/notify/dnotify/
  F:    include/linux/dnotify.h
@@@ -1835,6 -1842,7 +1850,6 @@@ S:      Maintaine
  DISKQUOTA
  P:    Jan Kara
  M:    jack@suse.cz
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/quota.txt
  F:    fs/quota/
@@@ -1856,6 -1864,7 +1871,6 @@@ P:      Maciej Sosnowsk
  M:    maciej.sosnowski@intel.com
  P:    Dan Williams
  M:    dan.j.williams@intel.com
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    drivers/dma/
  F:    include/linux/dma*
@@@ -1907,6 -1916,7 +1922,6 @@@ F:      drivers/scsi/dpt
  DRIVER CORE, KOBJECTS, AND SYSFS
  P:    Greg Kroah-Hartman
  M:    gregkh@suse.de
 -L:    linux-kernel@vger.kernel.org
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
  S:    Supported
  F:    Documentation/kobject.txt
@@@ -1972,8 -1982,8 +1987,8 @@@ F:      net/bridge/netfilter/ebt*.
  ECRYPT FILE SYSTEM
  P:    Tyler Hicks
  M:    tyhicks@linux.vnet.ibm.com
 -M:    Dustin Kirkland
 -P:    kirkland@canonical.com
 +P:    Dustin Kirkland
 +M:    kirkland@canonical.com
  L:    ecryptfs-devel@lists.launchpad.net
  W:    https://launchpad.net/ecryptfs
  S:    Supported
@@@ -1990,16 -2000,6 +2005,16 @@@ F:    Documentation/edac.tx
  F:    drivers/edac/edac_*
  F:    include/linux/edac.h
  
 +EDAC-AMD64
 +P:    Doug Thompson
 +M:    dougthompson@xmission.com
 +P:    Borislav Petkov
 +M:    borislav.petkov@amd.com
 +L:    bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
 +W:    bluesmoke.sourceforge.net
 +S:    Supported
 +F:    drivers/edac/amd64_edac*
 +
  EDAC-E752X
  P:    Mark Gross
  M:    mark.gross@intel.com
@@@ -2116,15 -2116,6 +2131,15 @@@ W:    http://sourceforge.net/projects/lpfc
  S:    Supported
  F:    drivers/scsi/lpfc/
  
 +ENE CB710 FLASH CARD READER DRIVER
 +P:    Michał Mirosław
 +M:    mirq-linux@rere.qmqm.pl
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    drivers/misc/cb710/
 +F:    drivers/mmc/host/cb710-mmc.*
 +F:    include/linux/cb710.h
 +
  EPSON 1355 FRAMEBUFFER DRIVER
  P:    Christopher Hoover
  M:    ch@murgatroid.com
@@@ -2253,6 -2244,7 +2268,6 @@@ F:      drivers/firewire
  F:    include/linux/firewire*.h
  
  FIRMWARE LOADER (request_firmware)
 -L:    linux-kernel@vger.kernel.org
  S:    Orphan
  F:    Documentation/firmware_class/
  F:    drivers/base/firmware*.c
@@@ -2289,6 -2281,7 +2304,6 @@@ M:      leoli@freescale.co
  P:    Zhang Wei
  M:    zw@zh-kernel.org
  L:    linuxppc-dev@ozlabs.org
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/dma/fsldma.*
  
@@@ -2354,7 -2347,7 +2369,7 @@@ F:      drivers/serial/ucc_uart.
  FREESCALE SOC SOUND DRIVERS
  P:    Timur Tabi
  M:    timur@freescale.com
 -L:    alsa-devel@alsa-project.org
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  L:    linuxppc-dev@ozlabs.org
  S:    Supported
  F:    sound/soc/fsl/fsl*
@@@ -2369,7 -2362,7 +2384,7 @@@ F:      fs/freevxfs
  
  FREEZER
  P:    Pavel Machek
 -M:    pavel@suse.cz
 +M:    pavel@ucw.cz
  P:    Rafael J. Wysocki
  M:    rjw@sisk.pl
  L:    linux-pm@lists.linux-foundation.org
@@@ -2488,6 -2481,7 +2503,6 @@@ F:      drivers/hwmon/hdaps.
  
  HYPERVISOR VIRTUAL CONSOLE DRIVER
  L:    linuxppc-dev@ozlabs.org
 -L:    linux-kernel@vger.kernel.org
  S:    Odd Fixes
  F:    drivers/char/hvc_*
  
@@@ -2554,6 -2548,7 +2569,6 @@@ F:      sound/parisc/harmony.
  HAYES ESP SERIAL DRIVER
  P:    Andrew J. Robinson
  M:    arobinso@nyx.net
 -L:    linux-kernel@vger.kernel.org
  W:    http://www.nyx.net/~arobinso
  S:    Maintained
  F:    Documentation/serial/hayes-esp.txt
@@@ -2579,6 -2574,7 +2594,6 @@@ F:      include/linux/cciss_ioctl.
  HFS FILESYSTEM
  P:    Roman Zippel
  M:    zippel@linux-m68k.org
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/hfs.txt
  F:    fs/hfs/
@@@ -2618,6 -2614,7 +2633,6 @@@ F:      include/linux/hid
  HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS
  P:    Thomas Gleixner
  M:    tglx@linutronix.de
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/timers/
  F:    kernel/hrtimer.c
@@@ -2756,6 -2753,7 +2771,6 @@@ F:      drivers/i2c/busses/i2c-tiny-usb.
  i386 BOOT CODE
  P:    H. Peter Anvin
  M:    hpa@zytor.com
 -L:    Linux-Kernel@vger.kernel.org
  S:    Maintained
  F:    arch/x86/boot/
  
@@@ -2840,18 -2838,6 +2855,18 @@@ L:    linux1394-devel@lists.sourceforge.ne
  S:    Maintained
  F:    drivers/ieee1394/raw1394*
  
 +IEEE 802.15.4 SUBSYSTEM
 +P:    Dmitry Eremin-Solenikov
 +M:    dbaryshkov@gmail.com
 +P:    Sergey Lapin
 +M:    slapin@ossfans.org
 +L:    linux-zigbee-devel@lists.sourceforge.net
 +W:    http://apps.sourceforge.net/trac/linux-zigbee
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
 +S:    Maintained
 +F:    net/ieee802154/
 +F:    drivers/ieee801254/
 +
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  P:    Mimi Zohar
  M:    zohar@us.ibm.com
@@@ -2883,8 -2869,7 +2898,8 @@@ P:      John McCutcha
  M:    john@johnmccutchan.com
  P:    Robert Love
  M:    rlove@rlove.org
 -L:    linux-kernel@vger.kernel.org
 +P:    Eric Paris
 +M:    eparis@parisplace.org
  S:    Maintained
  F:    Documentation/filesystems/inotify.txt
  F:    fs/notify/inotify/
@@@ -2932,6 -2917,7 +2947,6 @@@ F:      arch/x86/kernel/microcode_intel.
  INTEL I/OAT DMA DRIVER
  P:    Maciej Sosnowski
  M:    maciej.sosnowski@intel.com
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    drivers/dma/ioat*
  
@@@ -2947,6 -2933,7 +2962,6 @@@ F:      include/linux/intel-iommu.
  INTEL IOP-ADMA DMA DRIVER
  P:    Dan Williams
  M:    dan.j.williams@intel.com
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    drivers/dma/iop-adma.c
  
@@@ -3142,7 -3129,6 +3157,7 @@@ M:      samuel@sortiz.or
  L:    irda-users@lists.sourceforge.net (subscribers-only)
  W:    http://irda.sourceforge.net/
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git
  F:    Documentation/networking/irda.txt
  F:    drivers/net/irda/
  F:    include/net/irda/
@@@ -3259,6 -3245,7 +3274,6 @@@ M:      vgoyal@redhat.co
  P:    Haren Myneni
  M:    hbabu@us.ibm.com
  L:    kexec@lists.infradead.org
 -L:    linux-kernel@vger.kernel.org
  W:    http://lse.sourceforge.net/kdump/
  S:    Maintained
  F:    Documentation/kdump/
@@@ -3368,6 -3355,7 +3383,6 @@@ KEXE
  P:    Eric Biederman
  M:    ebiederm@xmission.com
  W:    http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 -L:    linux-kernel@vger.kernel.org
  L:    kexec@lists.infradead.org
  S:    Maintained
  F:    include/linux/kexec.h
@@@ -3384,27 -3372,10 +3399,27 @@@ F:   drivers/serial/kgdboc.
  F:    include/linux/kgdb.h
  F:    kernel/kgdb.c
  
 +KMEMCHECK
 +P:    Vegard Nossum
 +M:    vegardno@ifi.uio.no
 +P     Pekka Enberg
 +M:    penberg@cs.helsinki.fi
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
 +KMEMLEAK
 +P:    Catalin Marinas
 +M:    catalin.marinas@arm.com
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/kmemleak.txt
 +F:    include/linux/kmemleak.h
 +F:    mm/kmemleak.c
 +F:    mm/kmemleak-test.c
 +
  KMEMTRACE
  P:    Eduard - Gabriel Munteanu
  M:    eduard.munteanu@linux360.ro
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/trace/kmemtrace.txt
  F:    include/trace/kmemtrace.h
@@@ -3419,6 -3390,7 +3434,6 @@@ P:      David S. Mille
  M:    davem@davemloft.net
  P:    Masami Hiramatsu
  M:    mhiramat@redhat.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/kprobes.txt
  F:    include/linux/kprobes.h
@@@ -3427,6 -3399,7 +3442,6 @@@ F:      kernel/kprobes.
  KS0108 LCD CONTROLLER DRIVER
  P:    Miguel Ojeda Sandonis
  M:    miguel.ojeda.sandonis@gmail.com
 -L:    linux-kernel@vger.kernel.org
  W:    http://miguelojeda.es/auxdisplay.htm
  W:    http://jair.lab.fi.uva.es/~migojed/auxdisplay.htm
  S:    Maintained
@@@ -3590,6 -3563,7 +3605,6 @@@ P:      Peter Zijlstr
  M:    peterz@infradead.org
  P:    Ingo Molnar
  M:    mingo@redhat.com
 -L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-lockdep.git
  S:    Maintained
  F:    Documentation/lockdep*.txt
@@@ -3641,6 -3615,7 +3656,6 @@@ L:      linux-m32r-ja@ml.linux-m32r.org (in 
  W:    http://www.linux-m32r.org/
  S:    Maintained
  F:    arch/m32r/
 -F:    include/asm-m32r/
  
  M68K ARCHITECTURE
  P:    Geert Uytterhoeven
@@@ -3724,6 -3699,7 +3739,6 @@@ F:      include/linux/mv643xx.
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  P:    Nicolas Pitre
  M:    nico@cam.org
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
  MARVELL YUKON / SYSKONNECT DRIVER
@@@ -3777,6 -3753,7 +3792,6 @@@ F:      drivers/scsi/megaraid
  
  MEMORY MANAGEMENT
  L:    linux-mm@kvack.org
 -L:    linux-kernel@vger.kernel.org
  W:    http://www.linux-mm.org
  S:    Maintained
  F:    include/linux/mm.h
@@@ -3790,6 -3767,7 +3805,6 @@@ M:      xemul@openvz.or
  P:    KAMEZAWA Hiroyuki
  M:    kamezawa.hiroyu@jp.fujitsu.com
  L:    linux-mm@kvack.org
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    mm/memcontrol.c
  
@@@ -3832,6 -3810,7 +3847,6 @@@ F:      arch/mips
  MISCELLANEOUS MCA-SUPPORT
  P:    James Bottomley
  M:    James.Bottomley@HansenPartnership.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/ia64/mca.txt
  F:    Documentation/mca.txt
@@@ -3841,6 -3820,7 +3856,6 @@@ F:      include/linux/mca
  MODULE SUPPORT
  P:    Rusty Russell
  M:    rusty@rustcorp.com.au
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    include/linux/module.h
  F:    kernel/module.c
@@@ -3864,6 -3844,7 +3879,6 @@@ F:      drivers/mmc/host/imxmmc.
  MOUSE AND MISC DEVICES [GENERAL]
  P:    Alessandro Rubini
  M:    rubini@ipvvis.unipv.it
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/input/mouse/
  F:    include/linux/gpio_mouse.h
@@@ -3871,6 -3852,7 +3886,6 @@@
  MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
  P:    Jiri Slaby
  M:    jirislaby@gmail.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/serial/moxa-smartio
  F:    drivers/char/mxser.*
@@@ -3886,6 -3868,7 +3901,6 @@@ F:      drivers/platform/x86/msi-laptop.
  MULTIFUNCTION DEVICES (MFD)
  P:    Samuel Ortiz
  M:    sameo@linux.intel.com
 -L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
  S:    Supported
  F:    drivers/mfd/
@@@ -3893,6 -3876,7 +3908,6 @@@
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  P:    Pierre Ossman
  M:    pierre@ossman.eu
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/
  F:    include/linux/mmc/
@@@ -3900,6 -3884,7 +3915,6 @@@
  MULTIMEDIA CARD (MMC) ETC. OVER SPI
  P:    David Brownell
  M:    dbrownell@users.sourceforge.net
 -L:    linux-kernel@vger.kernel.org
  S:    Odd Fixes
  F:    drivers/mmc/host/mmc_spi.c
  F:    include/linux/spi/mmc_spi.h
@@@ -3914,6 -3899,7 +3929,6 @@@ F:      sound/oss/msnd
  MULTITECH MULTIPORT CARD (ISICOM)
  P:    Jiri Slaby
  M:    jirislaby@gmail.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/char/isicom.c
  F:    include/linux/isicom.h
@@@ -4157,6 -4143,7 +4172,6 @@@ NTFS FILESYSTE
  P:    Anton Altaparmakov
  M:    aia21@cantab.net
  L:    linux-ntfs-dev@lists.sourceforge.net
 -L:    linux-kernel@vger.kernel.org
  W:    http://www.linux-ntfs.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
  S:    Maintained
@@@ -4171,69 -4158,6 +4186,69 @@@ S:    Maintaine
  F:    drivers/video/riva/
  F:    drivers/video/nvidia/
  
 +OMAP SUPPORT
 +P:    Tony Lindgren <tony@atomide.com>
 +M:    tony@atomide.com
 +L:    linux-omap@vger.kernel.org
 +W:    http://www.muru.com/linux/omap/
 +W:    http://linux.omap.com/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
 +S:    Maintained
 +F:    arch/arm/*omap*
 +
 +OMAP CLOCK FRAMEWORK SUPPORT
 +P:    Paul Walmsley
 +M:    paul@pwsan.com
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/*omap*/*clock*
 +
 +OMAP POWER MANAGEMENT SUPPORT
 +P:    Kevin Hilman
 +M:    khilman@deeprootsystems.com
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/*omap*/*pm*
 +
 +OMAP AUDIO SUPPORT
 +P:    Jarkko Nikula
 +M:    jhnikula@gmail.com
 +L:    alsa-devel@alsa-project.org (subscribers-only)
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    sound/soc/omap/
 +
 +OMAP FRAMEBUFFER SUPPORT
 +P:    Imre Deak
 +M:    imre.deak@nokia.com
 +L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/video/omap/
 +
 +OMAP MMC SUPPORT
 +P:    Jarkko Lavinen
 +M:    jarkko.lavinen@nokia.com
 +L:    linux-kernel@vger.kernel.org
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/mmc/host/*omap*
 +
 +OMAP RANDOM NUMBER GENERATOR SUPPORT
 +P:    Deepak Saxena
 +M:    dsaxena@plexity.net
 +S:    Maintained
 +F:    drivers/char/hw_random/omap-rng.c
 +
 +OMAP USB SUPPORT
 +P:    Felipe Balbi
 +M:    felipe.balbi@nokia.com
 +P:    David Brownell
 +M:    dbrownell@users.sourceforge.net
 +L:    linux-usb@vger.kernel.org
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +
  OMFS FILESYSTEM
  P:    Bob Copeland
  M:    me@bobcopeland.com
@@@ -4390,6 -4314,7 +4405,6 @@@ M:      akataria@vmware.co
  P:    Rusty Russell
  M:    rusty@rustcorp.com.au
  L:    virtualization@lists.osdl.org
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    Documentation/ia64/paravirt_ops.txt
  F:    arch/*/kernel/paravirt*
@@@ -4440,6 -4365,7 +4455,6 @@@ F:      include/linux/leds-pca9532.
  PCI ERROR RECOVERY
  P:    Linas Vepstas
  M:    linas@austin.ibm.com
 -L:    linux-kernel@vger.kernel.org
  L:    linux-pci@vger.kernel.org
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.txt
@@@ -4448,6 -4374,7 +4463,6 @@@ F:      Documentation/powerpc/eeh-pci-error-
  PCI SUBSYSTEM
  P:    Jesse Barnes
  M:    jbarnes@virtuousgeek.org
 -L:    linux-kernel@vger.kernel.org
  L:    linux-pci@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6.git
  S:    Supported
@@@ -4482,20 -4409,11 +4497,20 @@@ F:   drivers/net/pcnet32.
  PER-TASK DELAY ACCOUNTING
  P:    Balbir Singh
  M:    balbir@linux.vnet.ibm.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    include/linux/delayacct.h
  F:    kernel/delayacct.c
  
 +PERFORMANCE COUNTER SUBSYSTEM
 +P:    Peter Zijlstra
 +M:    a.p.zijlstra@chello.nl
 +P:    Paul Mackerras
 +M:    paulus@samba.org
 +P:    Ingo Molnar
 +M:    mingo@elte.hu
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +
  PERSONALITY HANDLING
  P:    Christoph Hellwig
  M:    hch@infradead.org
@@@ -4513,6 -4431,7 +4528,6 @@@ F:      drivers/mtd/devices/phram.
  PKTCDVD DRIVER
  P:    Peter Osterlund
  M:    petero2@telia.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
@@@ -4520,6 -4439,7 +4535,6 @@@
  POSIX CLOCKS and TIMERS
  P:    Thomas Gleixner
  M:    tglx@linutronix.de
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    fs/timerfd.c
  F:    include/linux/timer*
@@@ -4530,6 -4450,7 +4545,6 @@@ P:      Anton Vorontso
  M:    cbou@mail.ru
  P:    David Woodhouse
  M:    dwmw2@infradead.org
 -L:    linux-kernel@vger.kernel.org
  T:    git git://git.infradead.org/battery-2.6.git
  S:    Maintained
  F:    include/linux/power_supply.h
@@@ -4581,6 -4502,7 +4596,6 @@@ F:      include/linux/if_pppol2tp.
  PREEMPTIBLE KERNEL
  P:    Robert Love
  M:    rml@tech9.net
 -L:    linux-kernel@vger.kernel.org
  L:    kpreempt-tech@lists.sourceforge.net
  W:    ftp://ftp.kernel.org/pub/linux/kernel/people/rml/preempt-kernel
  S:    Supported
@@@ -4609,8 -4531,8 +4624,8 @@@ S:      Maintaine
  F:    drivers/ata/sata_promise.*
  
  PS3 NETWORK SUPPORT
 -P:    Masakazu Mokuno
 -M:    mokuno@sm.sony.co.jp
 +P:    Geoff Levand
 +M:    geoffrey.levand@am.sony.com
  L:    netdev@vger.kernel.org
  L:    cbe-oss-dev@ozlabs.org
  S:    Supported
@@@ -4643,6 -4565,7 +4658,6 @@@ P:      Roland McGrat
  M:    roland@redhat.com
  P:    Oleg Nesterov
  M:    oleg@redhat.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    include/asm-generic/syscall.h
  F:    include/linux/ptrace.h
@@@ -4673,8 -4596,7 +4688,8 @@@ F:      drivers/pcmcia/pxa2xx
  F:    drivers/spi/pxa2xx*
  F:    drivers/usb/gadget/pxa2*
  F:    include/sound/pxa2xx-lib.h
 -F:    sound/soc/pxa/pxa2xx*
 +F:    sound/arm/pxa*
 +F:    sound/soc/pxa
  
  PXA168 SUPPORT
  P:    Eric Miao
@@@ -4728,6 -4650,7 +4743,6 @@@ F:      drivers/net/qlge
  QNX4 FILESYSTEM
  P:    Anders Larsen
  M:    al@alarsen.net
 -L:    linux-kernel@vger.kernel.org
  W:    http://www.alarsen.net/linux/qnx4fs/
  S:    Maintained
  F:    fs/qnx4/
@@@ -4774,6 -4697,7 +4789,6 @@@ F:      drivers/char/random.
  RAPIDIO SUBSYSTEM
  P:    Matt Porter
  M:    mporter@kernel.crashing.org
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/rapidio/
  
@@@ -4787,8 -4711,7 +4802,8 @@@ F:      drivers/net/wireless/ray
  RCUTORTURE MODULE
  P:    Josh Triplett
  M:    josh@freedesktop.org
 -L:    linux-kernel@vger.kernel.org
 +P:    Paul E. McKenney
 +M:    paulmck@linux.vnet.ibm.com
  S:    Maintained
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
@@@ -4796,6 -4719,7 +4811,6 @@@
  RDC R-321X SoC
  P:    Florian Fainelli
  M:    florian@openwrt.org
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  
  RDC R6040 FAST ETHERNET DRIVER
@@@ -4808,16 -4732,15 +4823,16 @@@ 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
  M:    dipankar@in.ibm.com
 +P:    Paul E. McKenney
 +M:    paulmck@linux.vnet.ibm.com
  W:    http://www.rdrop.com/users/paulmck/rclock/
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    Documentation/RCU/rcu.txt
  F:    Documentation/RCU/rcuref.txt
@@@ -4828,6 -4751,7 +4843,6 @@@ F:      kernel/rcupdate.
  REAL TIME CLOCK DRIVER
  P:    Paul Gortmaker
  M:    p_gortmaker@yahoo.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/rtc.txt
  F:    drivers/rtc/
@@@ -4848,9 -4772,9 +4863,9 @@@ S:      Supporte
  F:    fs/reiserfs/
  
  RFKILL
 -P:    Ivo van Doorn
 -M:    IvDoorn@gmail.com
 -L:    netdev@vger.kernel.org
 +P:    Johannes Berg
 +M:    johannes@sipsolutions.net
 +L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F     Documentation/rfkill.txt
  F:    net/rfkill/
@@@ -4965,6 -4889,7 +4980,6 @@@ S3C24XX SD/MMC Drive
  P:    Ben Dooks
  M:    ben-linux@fluff.org
  L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    drivers/mmc/host/s3cmci.*
  
@@@ -4990,6 -4915,7 +5005,6 @@@ P:      Ingo Molna
  M:    mingo@elte.hu
  P:    Peter Zijlstra
  M:    peterz@infradead.org
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    kernel/sched*
  F:    include/linux/sched.h
@@@ -5091,6 -5017,7 +5106,6 @@@ F:      drivers/mmc/host/sdhci.
  SECURITY SUBSYSTEM
  P:    James Morris
  M:    jmorris@namei.org
 -L:    linux-kernel@vger.kernel.org
  L:    linux-security-module@vger.kernel.org (suggested Cc:)
  T:    git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
  W:    http://security.wiki.kernel.org/
@@@ -5109,6 -5036,7 +5124,6 @@@ P:      James Morri
  M:    jmorris@namei.org
  P:    Eric Paris
  M:    eparis@parisplace.org
 -L:    linux-kernel@vger.kernel.org (kernel issues)
  L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
  W:    http://selinuxproject.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
@@@ -5205,6 -5133,7 +5220,6 @@@ P:      Vincent Sander
  M:    support@simtec.co.uk
  W:    http://www.simtec.co.uk/products/EB110ATX/
  S:    Supported
 -F:    arch/arm/mach-ebsa110/
  
  SIMTEC EB2410ITX (BAST)
  P:    Ben Dooks
@@@ -5371,6 -5300,7 +5386,6 @@@ F:      include/linux/sony-laptop.
  SONY MEMORYSTICK CARD SUPPORT
  P:    Alex Dubov
  M:    oakad@yahoo.com
 -L:    linux-kernel@vger.kernel.org
  W:    http://tifmxx.berlios.de/
  S:    Maintained
  F:    drivers/memstick/host/tifm_ms.c
@@@ -5380,7 -5310,7 +5395,7 @@@ P:      Jaroslav Kysel
  M:    perex@perex.cz
  P:    Takashi Iwai
  M:    tiwai@suse.de
 -L:    alsa-devel@alsa-project.org (subscribers-only)
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://www.alsa-project.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
  T:    git git://git.alsa-project.org/alsa-kernel.git
@@@ -5394,12 -5324,11 +5409,12 @@@ P:   Liam Girdwoo
  M:    lrg@slimlogic.co.uk
  P:    Mark Brown
  M:    broonie@opensource.wolfsonmicro.com
 -T:    git git://opensource.wolfsonmicro.com/linux-2.6-asoc
 -L:    alsa-devel@alsa-project.org (subscribers-only)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://alsa-project.org/main/index.php/ASoC
  S:    Supported
  F:    sound/soc/
 +F:    include/sound/soc*
  
  SPARC + UltraSPARC (sparc/sparc64)
  P:    David S. Miller
@@@ -5413,6 -5342,7 +5428,6 @@@ F:      arch/sparc
  SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
  P:    Roger Wolff
  M:    R.E.Wolff@BitWizard.nl
 -L:    linux-kernel@vger.kernel.org
  S:    Supported
  F:    Documentation/serial/specialix.txt
  F:    drivers/char/specialix*
@@@ -5458,6 -5388,7 +5473,6 @@@ F:      fs/squashfs
  SRM (Alpha) environment access
  P:    Jan-Benedict Glaw
  M:    jbglaw@lug-owl.de
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    arch/alpha/kernel/srm_env.c
  
@@@ -5472,6 -5403,7 +5487,6 @@@ S:      Maintaine
  STAGING SUBSYSTEM
  P:    Greg Kroah-Hartman
  M:    gregkh@suse.de
 -L:    linux-kernel@vger.kernel.org
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
  S:    Maintained
  F:    drivers/staging/
@@@ -5551,6 -5483,7 +5566,6 @@@ F:      include/linux/sysv_fs.
  TASKSTATS STATISTICS INTERFACE
  P:    Balbir Singh
  M:    balbir@linux.vnet.ibm.com
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/accounting/taskstats*
  F:    include/linux/taskstats*
@@@ -5613,6 -5546,20 +5628,6 @@@ F:     drivers/misc/tifm
  F:    drivers/mmc/host/tifm_sd.c
  F:    include/linux/tifm.h
  
 -TI OMAP MMC INTERFACE DRIVER
 -P:    Carlos Aguiar, Anderson Briglia and Syed Khasim
 -M:    linux-omap@vger.kernel.org
 -W:    http://linux.omap.com
 -W:    http://www.muru.com/linux/omap/
 -S:    Maintained
 -F:    drivers/mmc/host/omap.c
 -
 -TI OMAP RANDOM NUMBER GENERATOR SUPPORT
 -P:    Deepak Saxena
 -M:    dsaxena@plexity.net
 -S:    Maintained
 -F:    drivers/char/hw_random/omap-rng.c
 -
  TIPC NETWORK LAYER
  P:    Per Liden
  M:    per.liden@ericsson.com
@@@ -5643,6 -5590,7 +5658,6 @@@ P:      Kentaro Taked
  M:    takedakn@nttdata.co.jp
  P:    Tetsuo Handa
  M:    penguin-kernel@I-love.SAKURA.ne.jp
 -L:    linux-kernel@vger.kernel.org (kernel issues)
  L:    tomoyo-users-en@lists.sourceforge.jp (subscribers-only, for developers and users in English)
  L:    tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
  L:    tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
@@@ -5694,19 -5642,15 +5709,19 @@@ F:   drivers/char/tpm
  TRIVIAL PATCHES
  P:    Jiri Kosina
  M:    trivial@kernel.org
 -L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
  S:    Maintained
 +F:    drivers/char/tty_*
 +F:    drivers/serial/serial_core.c
 +F:    include/linux/serial_core.h
 +F:    include/linux/serial.h
 +F:    include/linux/tty.h
  
  TTY LAYER
  P:    Alan Cox
  M:    alan@lxorguk.ukuu.org.uk
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
 +T:    stgit http://zeniv.linux.org.uk/~alan/ttydev/
  
  TULIP NETWORK DRIVERS
  P:    Grant Grundler
@@@ -5777,6 -5721,7 +5792,6 @@@ F:      fs/udf
  UFS FILESYSTEM
  P:    Evgeniy Dushistov
  M:    dushistov@mail.ru
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/ufs.txt
  F:    fs/ufs/
@@@ -5793,6 -5738,7 +5808,6 @@@ F:      include/linux/uwb
  UNIFORM CDROM DRIVER
  P:    Jens Axboe
  M:    axboe@kernel.dk
 -L:    linux-kernel@vger.kernel.org
  W:    http://www.kernel.dk
  S:    Maintained
  F:    Documentation/cdrom/
@@@ -5821,6 -5767,7 +5836,6 @@@ F:      drivers/usb/class/cdc-acm.
  USB BLOCK DRIVER (UB ub)
  P:    Pete Zaitcev
  M:    zaitcev@redhat.com
 -L:    linux-kernel@vger.kernel.org
  L:    linux-usb@vger.kernel.org
  S:    Supported
  F:    drivers/block/ub.c
@@@ -6113,12 -6060,6 +6128,12 @@@ L:    linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/net/wireless/rndis_wlan.c
  
 +USB XHCI DRIVER
 +P:    Sarah Sharp
 +M:    sarah.a.sharp@intel.com
 +L:    linux-usb@vger.kernel.org
 +S:    Supported
 +
  USB ZC0301 DRIVER
  P:    Luca Risolia
  M:    luca.risolia@studio.unibo.it
@@@ -6166,6 -6107,7 +6181,6 @@@ P:      Hans J. Koc
  M:    hjk@linutronix.de
  P:    Greg Kroah-Hartman
  M:    gregkh@suse.de
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/DocBook/uio-howto.tmpl
  F:    drivers/uio/
@@@ -6191,6 -6133,7 +6206,6 @@@ F:      drivers/video/uvesafb.
  VFAT/FAT/MSDOS FILESYSTEM
  P:    OGAWA Hirofumi
  M:    hirofumi@mail.parknet.co.jp
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    Documentation/filesystems/vfat.txt
  F:    fs/fat/
@@@ -6234,14 -6177,6 +6249,14 @@@ F:    drivers/net/macvlan.
  F:    include/linux/if_*vlan.h
  F:    net/8021q/
  
 +VLYNQ BUS
 +P:    Florian Fainelli
 +M:    florian@openwrt.org
 +L:    openwrt-devel@lists.openwrt.org
 +S:    Maintained
 +F:    drivers/vlynq/vlynq.c
 +F:    include/linux/vlynq.h
 +
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  P:    Liam Girdwood
  M:    lrg@slimlogic.co.uk
@@@ -6295,6 -6230,7 +6310,6 @@@ F:      drivers/hwmon/w83793.
  W83L51xD SD/MMC CARD INTERFACE DRIVER
  P:    Pierre Ossman
  M:    pierre@ossman.eu
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/mmc/host/wbsd.*
  
@@@ -6381,6 -6317,7 +6396,6 @@@ M:      mingo@redhat.co
  P:    H. Peter Anvin
  M:    hpa@zytor.com
  M:    x86@kernel.org
 -L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
  S:    Maintained
  F:    Documentation/x86/
@@@ -6416,6 -6353,7 +6431,6 @@@ XILINX SYSTEMACE DRIVE
  P:    Grant Likely
  M:    grant.likely@secretlab.ca
  W:    http://www.secretlab.ca/
 -L:    linux-kernel@vger.kernel.org
  S:    Maintained
  F:    drivers/block/xsysace.c
  
@@@ -6480,9 -6418,5 +6495,9 @@@ F:      drivers/serial/zs.
  
  THE REST
  P:    Linus Torvalds
 +M:    torvalds@linux-foundation.org
 +L:    linux-kernel@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
  S:    Buried alive in reporters
 +F:    *
 +F:    */

diff --combined arch/arm/mm/mmu.c
index fdaa9bb87c163b89b19d8daa40f15352a1c06447,0b91bb20cf95e5f6719065cdb06c615408da1f00..4722582b17b82f526feef2d2f439bef26a98e946
--- 1/arch/arm/mm/mmu.c
--- 2/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -255,7 -255,6 +255,7 @@@ const struct mem_type *get_mem_type(uns
  {
        return type < ARRAY_SIZE(mem_types) ? &mem_types[type] : NULL;
  }
 +EXPORT_SYMBOL(get_mem_type);
  
  /*
   * Adjust the PMD section entries according to the CPU in use.
@@@ -836,24 -835,17 +836,31 @@@ void __init reserve_node_zero(pg_data_
                                BOOTMEM_EXCLUSIVE);
        }
  
+       if (machine_is_treo680()) {
+               reserve_bootmem_node(pgdat, 0xa0000000, 0x1000,
+                               BOOTMEM_EXCLUSIVE);
+               reserve_bootmem_node(pgdat, 0xa2000000, 0x1000,
+                               BOOTMEM_EXCLUSIVE);
+       }
+ 
        if (machine_is_palmt5())
                reserve_bootmem_node(pgdat, 0xa0200000, 0x1000,
                                BOOTMEM_EXCLUSIVE);
  
 +      /*
 +       * U300 - This platform family can share physical memory
 +       * between two ARM cpus, one running Linux and the other
 +       * running another OS.
 +       */
 +      if (machine_is_u300()) {
 +#ifdef CONFIG_MACH_U300_SINGLE_RAM
 +#if ((CONFIG_MACH_U300_ACCESS_MEM_SIZE & 1) == 1) &&  \
 +      CONFIG_MACH_U300_2MB_ALIGNMENT_FIX
 +              res_size = 0x00100000;
 +#endif
 +#endif
 +      }
 +
  #ifdef CONFIG_SA1111
        /*
         * Because of the SA1111 DMA bug, we want to preserve our