Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'for-linus' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  HTC Dream: mmc compilation fixes
  video: Allow selecting MSM framebuffer in Kconfig
  Add arm msm maintainer entry
  msm: Add memory map for HTC Dream
  msm: add minimal board file for HTC Dream device
  msm: make debugging UART (for DEBUG_LL) configurable

diff --combined MAINTAINERS
index 520a3b3,5a058b5..14eab97
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -182,7 -182,7 +182,7 @@@ M: Ron Minnich <rminnich@sandia.gov
  M:    Latchesar Ionkov <lucho@ionkov.net>
  L:    v9fs-developer@lists.sourceforge.net
  W:    http://swik.net/v9fs
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
  S:    Maintained
  F:    Documentation/filesystems/9p.txt
  F:    fs/9p/
@@@ -327,13 -327,6 +327,13 @@@ M:       Colin Leroy <colin@colino.net
  S:    Maintained
  F:    drivers/macintosh/therm_adt746x.c
  
 +ADT7475 HARDWARE MONITOR DRIVER
 +M:    Jean Delvare <khali@linux-fr.org>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/adt7475
 +F:    drivers/hwmon/adt7475.c
 +
  ADVANSYS SCSI DRIVER
  M:    Matthew Wilcox <matthew@wil.cx>
  L:    linux-scsi@vger.kernel.org
@@@ -493,6 -486,13 +493,6 @@@ S:        Maintaine
  F:    drivers/net/appletalk/
  F:    net/appletalk/
  
 -APPLETOUCH TOUCHPAD DRIVER
 -M:    Johannes Berg <johannes@sipsolutions.net>
 -L:    linux-input@vger.kernel.org
 -S:    Maintained
 -F:    Documentation/input/appletouch.txt
 -F:    drivers/input/mouse/appletouch.c
 -
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <jayalk@intworks.biz>
  S:    Maintained
@@@ -512,32 -512,10 +512,32 @@@ W:      http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/
  
 +ARM PRIMECELL AACI PL041 DRIVER
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    sound/arm/aaci.*
 +
 +ARM PRIMECELL CLCD PL110 DRIVER
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/video/amba-clcd.*
 +
 +ARM PRIMECELL KMI PL050 DRIVER
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/input/serio/ambakmi.*
 +F:    include/linux/amba/kmi.h
 +
  ARM PRIMECELL MMCI PL180/1 DRIVER
  S:    Orphan
  F:    drivers/mmc/host/mmci.*
  
 +ARM PRIMECELL BUS SUPPORT
 +M:    Russell King <linux@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/amba/
 +F:    include/linux/amba/bus.h
 +
  ARM/ADI ROADRUNNER MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -659,9 -637,6 +659,9 @@@ ARM/FREESCALE IMX / MXC ARM ARCHITECTUR
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 +T:    git://git.pengutronix.de/git/imx/linux-2.6.git
 +F:    arch/arm/mach-mx*/
 +F:    arch/arm/plat-mxc/
  
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -732,19 -707,6 +732,19 @@@ L:       linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/
  
 +ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
 +M:    Jonathan Cameron <jic23@cam.ac.uk>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-pxa/imote2.c
 +
 +ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
 +M:    Jonathan Cameron <jic23@cam.ac.uk>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-pxa/stargate2.c
 +F:    drivers/pcmcia/pxa2xx_stargate2.c
 +
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
@@@ -787,20 -749,25 +787,33 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <mkpetch@internode.on.net>
  S:    Maintained
  
 +ARM/NOMADIK ARCHITECTURE
 +M:     Alessandro Rubini <rubini@unipv.it>
 +M:     STEricsson <STEricsson_nomadik_linux@list.st.com>
 +L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:     Maintained
 +F:     arch/arm/mach-nomadik/
 +F:     arch/arm/plat-nomadik/
 +
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  M:    Nelson Castillo <arhuaco@freaks-unidos.net>
  L:    openmoko-kernel@lists.openmoko.org (subscribers-only)
  W:    http://wiki.openmoko.org/wiki/Neo_FreeRunner
  S:    Supported
  
+ ARM/QUALCOMM MSM MACHINE SUPPORT
+ M:    David Brown <davidb@codeaurora.org>
+ M:    Daniel Walker <dwalker@codeaurora.org>
+ M:    Bryan Huntsman <bryanh@codeaurora.org>
+ F:    arch/arm/mach-msm/
+ F:    drivers/video/msm/
+ F:    drivers/mmc/host/msm_sdcc.c
+ F:    drivers/mmc/host/msm_sdcc.h
+ F:    drivers/serial/msm_serial.h
+ F:    drivers/serial/msm_serial.c
+ T:    git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git
+ S:    Maintained
+ 
  ARM/TOSA MACHINE SUPPORT
  M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  M:    Dirk Opfer <dirk@opfer-online.de>
@@@ -939,12 -906,6 +952,12 @@@ L:       linux-arm-kernel@lists.infradead.or
  W:    http://www.mcuos.com
  S:    Maintained
  
 +ARM/U8500 ARM ARCHITECTURE
 +M:    Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-ux500/
 +
  ARM/VFP SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -958,6 -919,7 +971,6 @@@ M: Karol Kozimor <sziwan@users.sourcefo
  L:    acpi4asus-user@lists.sourceforge.net
  W:    http://acpi4asus.sf.net
  S:    Maintained
 -F:    arch/x86/kernel/acpi/boot.c
  F:    drivers/platform/x86/asus_acpi.c
  
  ASUS ASB100 HARDWARE MONITOR DRIVER
@@@ -1079,7 -1041,7 +1092,7 @@@ F:      drivers/serial/atmel_serial.
  
  ATMEL LCDFB DRIVER
  M:    Nicolas Ferre <nicolas.ferre@atmel.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/atmel_lcdfb.c
  F:    include/video/atmel_lcdc.h
@@@ -1150,6 -1112,7 +1163,6 @@@ F:      include/net/ax25.
  F:    net/ax25/
  
  B43 WIRELESS DRIVER
 -M:    Michael Buesch <mb@bu3sch.de>
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
@@@ -1295,10 -1258,11 +1308,10 @@@ S:   Supporte
  F:    drivers/net/tg3.*
  
  BROCADE BFA FC SCSI DRIVER
 -P:      Jing Huang
 -M:      huangj@brocade.com
 -L:      linux-scsi@vger.kernel.org
 -S:      Supported
 -F:      drivers/scsi/bfa/
 +M:    Jing Huang <huangj@brocade.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/bfa/
  
  BSG (block layer generic sg v4 driver)
  M:    FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
@@@ -1848,19 -1812,6 +1861,19 @@@ S:    Maintaine
  F:    drivers/scsi/dpt*
  F:    drivers/scsi/dpt/
  
 +DRBD DRIVER
 +P:     Philipp Reisner
 +P:     Lars Ellenberg
 +M:     drbd-dev@lists.linbit.com
 +L:     drbd-user@lists.linbit.com
 +W:     http://www.drbd.org
 +T:     git git://git.drbd.org/linux-2.6-drbd.git drbd
 +T:     git git://git.drbd.org/drbd-8.3.git
 +S:     Supported
 +F:     drivers/block/drbd/
 +F:     lib/lru_cache.c
 +F:     Documentation/blockdev/drbd/
 +
  DRIVER CORE, KOBJECTS, AND SYSFS
  M:    Greg Kroah-Hartman <gregkh@suse.de>
  T:    quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/
@@@ -2177,7 -2128,7 +2190,7 @@@ F:      drivers/net/wan/dlci.
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  W:    http://linux-fbdev.sourceforge.net/
  S:    Orphan
  F:    Documentation/fb/
@@@ -2200,7 -2151,7 +2213,7 @@@ F:      drivers/i2c/busses/i2c-cpm.
  
  FREESCALE IMX / MXC FRAMEBUFFER DRIVER
  M:    Sascha Hauer <kernel@pengutronix.de>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/plat-mxc/include/mach/imxfb.h
@@@ -2376,13 -2327,6 +2389,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/media/video/gspca/finepix.c
  
 +GSPCA GL860 SUBDRIVER
 +M:    Olivier Lorin <o.lorin@laposte.net>
 +L:    linux-media@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 +S:    Maintained
 +F:    drivers/media/video/gspca/gl860/
 +
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <erik.andren@gmail.com>
  L:    linux-media@vger.kernel.org
@@@ -2423,9 -2367,7 +2436,9 @@@ HARDWARE MONITORIN
  L:    lm-sensors@lm-sensors.org
  W:    http://www.lm-sensors.org/
  S:    Orphan
 +F:    Documentation/hwmon/
  F:    drivers/hwmon/
 +F:    include/linux/hwmon*.h
  
  HARDWARE RANDOM NUMBER GENERATOR CORE
  M:    Matt Mackall <mpm@selenic.com>
@@@ -2606,7 -2548,8 +2619,7 @@@ S:      Maintaine
  F:    Documentation/i2c/
  F:    drivers/i2c/
  F:    include/linux/i2c.h
 -F:    include/linux/i2c-dev.h
 -F:    include/linux/i2c-id.h
 +F:    include/linux/i2c-*.h
  
  I2C-TINY-USB DRIVER
  M:    Till Harbaum <till@harbaum.org>
@@@ -2707,7 -2650,7 +2720,7 @@@ S:      Supporte
  F:    security/integrity/ima/
  
  IMS TWINTURBO FRAMEBUFFER DRIVER
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Orphan
  F:    drivers/video/imsttfb.c
  
@@@ -2742,14 -2685,14 +2755,14 @@@ F:   drivers/input
  
  INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)
  M:    Sylvain Meyer <sylvain.meyer@worldonline.fr>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    Documentation/fb/intelfb.txt
  F:    drivers/video/intelfb/
  
  INTEL 810/815 FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/i810/
  
@@@ -2861,15 -2804,6 +2874,15 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/iwlwifi/
  
 +INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
 +M:    Samuel Ortiz <samuel.ortiz@intel.com>
 +M:    Zhu Yi <yi.zhu@intel.com>
 +M:    Intel Linux Wireless <ilw@linux.intel.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Supported
 +W:    http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
 +F:    drivers/net/wireless/iwmc3200wifi/
 +
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-mips@linux-mips.org
@@@ -2904,7 -2838,7 +2917,7 @@@ F:      drivers/infiniband/hw/ipath
  
  IPMI SUBSYSTEM
  M:    Corey Minyard <minyard@acm.org>
 -L:    openipmi-developer@lists.sourceforge.net
 +L:    openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
  W:    http://openipmi.sourceforge.net/
  S:    Supported
  F:    Documentation/IPMI.txt
@@@ -3068,8 -3002,11 +3081,8 @@@ S:     Maintaine
  F:    fs/autofs4/
  
  KERNEL BUILD
 -M:    Sam Ravnborg <sam@ravnborg.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git
  L:    linux-kbuild@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    Documentation/kbuild/
  F:    Makefile
  F:    scripts/Makefile.*
@@@ -3141,7 -3078,6 +3154,7 @@@ S:      Supporte
  F:    Documentation/s390/kvm.txt
  F:    arch/s390/include/asm/kvm*
  F:    arch/s390/kvm/
 +F:    drivers/s390/kvm/
  
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
@@@ -3163,13 -3099,9 +3176,13 @@@ F:    kernel/kgdb.
  
  KMEMCHECK
  M:    Vegard Nossum <vegardno@ifi.uio.no>
 -P     Pekka Enberg
 -M:    penberg@cs.helsinki.fi
 +M:    Pekka Enberg <penberg@cs.helsinki.fi>
  S:    Maintained
 +F:    Documentation/kmemcheck.txt
 +F:    arch/x86/include/asm/kmemcheck.h
 +F:    arch/x86/mm/kmemcheck/
 +F:    include/linux/kmemcheck.h
 +F:    mm/kmemcheck.c
  
  KMEMLEAK
  M:    Catalin Marinas <catalin.marinas@arm.com>
@@@ -3321,12 -3253,6 +3334,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/lis3lv02d
  F:    drivers/hwmon/lis3lv02d.*
  
 +LM73 HARDWARE MONITOR DRIVER
 +M:    Guillaume Ligneul <guillaume.ligneul@gmail.com>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    drivers/hwmon/lm73.c
 +
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -3476,7 -3402,7 +3489,7 @@@ S:      Supporte
  
  MATROX FRAMEBUFFER DRIVER
  M:    Petr Vandrovec <vandrove@vc.cvut.cz>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
@@@ -3705,7 -3631,7 +3718,7 @@@ L:      netfilter@vger.kernel.or
  L:    coreteam@netfilter.org
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
 -T:    git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
  S:    Supported
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
@@@ -3752,7 -3678,6 +3765,7 @@@ L:      netdev@vger.kernel.or
  W:    http://www.linuxfoundation.org/en/Net
  W:    http://patchwork.ozlabs.org/project/netdev/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
  S:    Maintained
  F:    net/
  F:    include/net/
@@@ -3801,9 -3726,9 +3814,9 @@@ F:      include/linux/if_
  F:    include/linux/*device.h
  
  NETXEN (1/10) GbE SUPPORT
 -M:    Dhananjay Phadke <dhananjay@netxen.com>
 +M:    Amit Kumar Salecha <amit.salecha@qlogic.com>
  L:    netdev@vger.kernel.org
 -W:    http://www.netxen.com
 +W:    http://www.qlogic.com
  S:    Supported
  F:    drivers/net/netxen/
  
@@@ -3863,7 -3788,7 +3876,7 @@@ F:      fs/ntfs
  
  NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/riva/
  F:    drivers/video/nvidia/
@@@ -3898,28 -3823,11 +3911,28 @@@ F:   sound/soc/omap
  
  OMAP FRAMEBUFFER SUPPORT
  M:    Imre Deak <imre.deak@nokia.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  L:    linux-omap@vger.kernel.org
  S:    Maintained
  F:    drivers/video/omap/
  
 +OMAP DISPLAY SUBSYSTEM SUPPORT (DSS2)
 +M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
 +L:    linux-omap@vger.kernel.org
 +L:    linux-fbdev@vger.kernel.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/video/omap2/dss/
 +F:    drivers/video/omap2/vrfb.c
 +F:    drivers/video/omap2/vram.c
 +F:    Documentation/arm/OMAP/DSS
 +
 +OMAP FRAMEBUFFER SUPPORT (FOR DSS2)
 +M:    Tomi Valkeinen <tomi.valkeinen@nokia.com>
 +L:    linux-omap@vger.kernel.org
 +L:    linux-fbdev@vger.kernel.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/video/omap2/omapfb/
 +
  OMAP MMC SUPPORT
  M:    Jarkko Lavinen <jarkko.lavinen@nokia.com>
  L:    linux-omap@vger.kernel.org
@@@ -4221,13 -4129,6 +4234,13 @@@ W:    http://www.pmc-sierra.com
  S:    Supported
  F:    drivers/scsi/pmcraid.*
  
 +PMC SIERRA PM8001 DRIVER
 +M:    jack_wang@usish.com
 +M:    lindar_liu@usish.com
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/pm8001/
 +
  POSIX CLOCKS and TIMERS
  M:    Thomas Gleixner <tglx@linutronix.de>
  S:    Supported
@@@ -4428,21 -4329,19 +4441,21 @@@ F:   include/linux/qnxtypes.
  
  RADEON FRAMEBUFFER DISPLAY DRIVER
  M:    Benjamin Herrenschmidt <benh@kernel.crashing.org>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/aty/radeon*
  F:    include/linux/radeonfb.h
  
  RAGE128 FRAMEBUFFER DISPLAY DRIVER
  M:    Paul Mackerras <paulus@samba.org>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/aty/aty128fb.c
  
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
 +M:    Ivo van Doorn <IvDoorn@gmail.com>
 +M:    Gertjan van Wingerde <gwingerde@gmail.com>
  L:    linux-wireless@vger.kernel.org
  L:    users@rt2x00.serialmonkey.com (moderated for non-subscribers)
  W:    http://rt2x00.serialmonkey.com/
@@@ -4530,7 -4429,7 +4543,7 @@@ RFKIL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
 -F     Documentation/rfkill.txt
 +F:    Documentation/rfkill.txt
  F:    net/rfkill/
  
  RISCOM8 DRIVER
@@@ -4574,7 -4473,7 +4587,7 @@@ F:      drivers/net/wireless/rtl818x/rtl8187
  
  S3 SAVAGE FRAMEBUFFER DRIVER
  M:    Antonino Daplas <adaplas@gmail.com>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/savage/
  
@@@ -4586,7 -4485,6 +4599,7 @@@ L:      linux-s390@vger.kernel.or
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    arch/s390/
 +F:    drivers/s390/
  
  S390 NETWORK DRIVERS
  M:    Ursula Braun <ursula.braun@de.ibm.com>
@@@ -4602,7 -4500,6 +4615,7 @@@ M:      Felix Beck <felix.beck@de.ibm.com
  M:    Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
  M:    linux390@de.ibm.com
  L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
  F:    drivers/s390/crypto/
  
@@@ -4752,7 -4649,7 +4765,7 @@@ F:      drivers/mmc/host/sdhci-s3c.
  SECURITY SUBSYSTEM
  M:    James Morris <jmorris@namei.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
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
  W:    http://security.wiki.kernel.org/
  S:    Supported
  F:    security/
@@@ -4788,11 -4685,12 +4801,11 @@@ F:   include/linux/ata.
  F:    include/linux/libata.h
  
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 -P:     Jayamohan Kallickal
 -M:     jayamohank@serverengines.com
 -L:     linux-scsi@vger.kernel.org
 -W:     http://www.serverengines.com
 -S:     Supported
 -F:     drivers/scsi/be2iscsi/
 +M:    Jayamohan Kallickal <jayamohank@serverengines.com>
 +L:    linux-scsi@vger.kernel.org
 +W:    http://www.serverengines.com
 +S:    Supported
 +F:    drivers/scsi/be2iscsi/
  
  SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
  M:    Sathya Perla <sathyap@serverengines.com>
@@@ -5352,7 -5250,7 +5365,7 @@@ S:      Maintaine
  F:    drivers/scsi/u14-34f.c
  
  UBI FILE SYSTEM (UBIFS)
 -M:    Artem Bityutskiy <dedekind@infradead.org>
 +M:    Artem Bityutskiy <dedekind1@gmail.com>
  M:    Adrian Hunter <adrian.hunter@nokia.com>
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubifs-2.6.git
@@@ -5403,7 -5301,7 +5416,7 @@@ F:      drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  
  UNSORTED BLOCK IMAGES (UBI)
 -M:    Artem Bityutskiy <dedekind@infradead.org>
 +M:    Artem Bityutskiy <dedekind1@gmail.com>
  W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubi-2.6.git
@@@ -5680,11 -5578,9 +5693,11 @@@ S:    Maintaine
  F:    drivers/net/wireless/rndis_wlan.c
  
  USB XHCI DRIVER
 -M:    Sarah Sharp <sarah.a.sharp@intel.com>
 +M:    Sarah Sharp <sarah.a.sharp@linux.intel.com>
  L:    linux-usb@vger.kernel.org
  S:    Supported
 +F:    drivers/usb/host/xhci*
 +F:    drivers/usb/host/pci-quirks*
  
  USB ZC0301 DRIVER
  M:    Luca Risolia <luca.risolia@studio.unibo.it>
@@@ -5741,7 -5637,7 +5754,7 @@@ S:      Maintaine
  
  UVESAFB DRIVER
  M:    Michal Januszewski <spock@gentoo.org>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  W:    http://dev.gentoo.org/~spock/projects/uvesafb/
  S:    Maintained
  F:    Documentation/fb/uvesafb.txt
@@@ -5774,7 -5670,7 +5787,7 @@@ F:      drivers/mmc/host/via-sdmmc.
  VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER
  M:    Joseph Chan <JosephChan@via.com.tw>
  M:    Scott Fang <ScottFang@viatech.com.cn>
 -L:    linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
 +L:    linux-fbdev@vger.kernel.org
  S:    Maintained
  F:    drivers/video/via/
  
@@@ -5800,19 -5696,11 +5813,19 @@@ F:   drivers/vlynq/vlynq.
  F:    include/linux/vlynq.h
  
  VMWARE VMXNET3 ETHERNET DRIVER
 -M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 -M:     VMware, Inc. <pv-drivers@vmware.com>
 -L:     netdev@vger.kernel.org
 -S:     Maintained
 -F:     drivers/net/vmxnet3/
 +M:    Shreyas Bhatewara <sbhatewara@vmware.com>
 +M:    "VMware, Inc." <pv-drivers@vmware.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/vmxnet3/
 +
 +VMware PVSCSI driver
 +M:    Alok Kataria <akataria@vmware.com>
 +M:    VMware PV-Drivers <pv-drivers@vmware.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Maintained
 +F:    drivers/scsi/vmw_pvscsi.c
 +F:    drivers/scsi/vmw_pvscsi.h
  
  VOLTAGE AND CURRENT REGULATOR FRAMEWORK
  M:    Liam Girdwood <lrg@slimlogic.co.uk>

diff --combined drivers/video/Kconfig
index bb5fbed,04b40ee..99c0df1
--- 1/drivers/video/Kconfig
--- 2/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@@ -5,9 -5,6 +5,9 @@@
  menu "Graphics support"
        depends on HAS_IOMEM
  
 +config HAVE_FB_ATMEL
 +      bool
 +
  source "drivers/char/agp/Kconfig"
  
  source "drivers/gpu/vga/Kconfig"
@@@ -940,7 -937,7 +940,7 @@@ config FB_S1D13XX
  
  config FB_ATMEL
        tristate "AT91/AT32 LCD Controller support"
 -      depends on FB && (ARCH_AT91SAM9261 || ARCH_AT91SAM9G10 || ARCH_AT91SAM9263 || ARCH_AT91SAM9RL || ARCH_AT91SAM9G45 || ARCH_AT91CAP9 || AVR32)
 +      depends on FB && HAVE_FB_ATMEL
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
@@@ -2066,7 -2063,6 +2066,7 @@@ config XEN_FBDEV_FRONTEN
        select FB_SYS_IMAGEBLIT
        select FB_SYS_FOPS
        select FB_DEFERRED_IO
 +      select XEN_XENBUS_FRONTEND
        default y
        help
          This driver implements the front-end of the Xen virtual
@@@ -2125,13 -2121,13 +2125,13 @@@ config FB_EP93X
  
  config FB_PRE_INIT_FB
        bool "Don't reinitialize, use bootloader's GDC/Display configuration"
 -      depends on FB_MB862XX_LIME
 +      depends on FB && FB_MB862XX_LIME
        ---help---
          Select this option if display contents should be inherited as set by
          the bootloader.
  
  config FB_MSM
-       tristate
+       tristate "MSM Framebuffer support"
        depends on FB && ARCH_MSM
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
@@@ -2165,7 -2161,6 +2165,7 @@@ config FB_BROADSHEE
          a bridge adapter.
  
  source "drivers/video/omap/Kconfig"
 +source "drivers/video/omap2/Kconfig"
  
  source "drivers/video/backlight/Kconfig"
  source "drivers/video/display/Kconfig"