Merge branch 'fbdev-next' of github.com:timur-tabi/linux-2.6 into for-linus

* 'fbdev-next' of github.com:timur-tabi/linux-2.6:
  drivers/video: fsl-diu-fb: store EDID data in the global object
  drivers/video: fsl-diu-fb: don't touch registers for unused features
  drivers/video: fsl-diu-fb: clean up reset of primary display
  drivers/video: fsl-diu-fb: remove unused 'cursor_reset' variable
  drivers/video: fsl-diu-fb: improve message displays
  drivers/video: fsl-diu-fb: streamline enabling of interrupts
  drivers/video: fsl-diu-fb: add support for set_gamma ioctls
  drivers/video: fsl-diu-fb: simplify platforms that have only one port
  MAINTAINERS: Make Timur Tabi the maintainer for the Freescale DIU driver

diff --combined MAINTAINERS
index 9386a63ea8f63b653b683379ea54c7bd91eb72ec,1eeaaf5cb2314fa783c8844e859dd1935473de6c..477a20fc3436c1c32aff6e2b95992820e7426d0a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -184,16 -184,6 +184,16 @@@ S:       Maintaine
  F:    Documentation/filesystems/9p.txt
  F:    fs/9p/
  
 +A8293 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/a8293*
 +
  AACRAID SCSI RAID DRIVER
  M:    Adaptec OEM Raid Solutions <[email protected]>
  L:    [email protected]
@@@ -235,7 -225,6 +235,7 @@@ F: drivers/platform/x86/acer-wmi.
  
  ACPI
  M:    Len Brown <[email protected]>
 +M:    Rafael J. Wysocki <[email protected]>
  L:    [email protected]
  W:    http://www.lesswatts.org/projects/acpi/
  Q:    http://patchwork.kernel.org/project/linux-acpi/list/
@@@ -402,26 -391,6 +402,26 @@@ M:       Riccardo Facchetti <[email protected]
  S:    Maintained
  F:    sound/oss/aedsp16.c
  
 +AF9013 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/af9013*
 +
 +AF9033 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/af9033*
 +
  AFFS FILE SYSTEM
  L:    [email protected]
  S:    Orphan
@@@ -503,7 -472,7 +503,7 @@@ F: include/linux/altera_uart.
  F:    include/linux/altera_jtaguart.h
  
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 -M:    Andreas Herrmann <andreas.herrmann3@amd.com>
 +M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/hwmon/fam15h_power
@@@ -526,17 -495,17 +526,17 @@@ F:      drivers/video/geode
  F:    arch/x86/include/asm/geode.h
  
  AMD IOMMU (AMD-VI)
 -M:    Joerg Roedel <jo[email protected]>
 +M:    Joerg Roedel <jo[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git
 -S:    Supported
 +S:    Maintained
  F:    drivers/iommu/amd_iommu*.[ch]
  F:    include/linux/amd-iommu.h
  
  AMD MICROCODE UPDATE SUPPORT
 -M:    Andreas Herrmann <andreas.herrmann3@amd.com>
 +M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    arch/x86/kernel/microcode_amd.c
  
  AMS (Apple Motion Sensor) DRIVER
@@@ -603,7 -572,7 +603,7 @@@ F: drivers/net/appletalk
  F:    net/appletalk/
  
  ARASAN COMPACT FLASH PATA CONTROLLER
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    include/linux/pata_arasan_cf_data.h
@@@ -626,6 -595,7 +626,6 @@@ M: Will Deacon <[email protected]
  S:    Maintained
  F:    arch/arm/kernel/perf_event*
  F:    arch/arm/oprofile/common.c
 -F:    arch/arm/kernel/pmu.c
  F:    arch/arm/include/asm/pmu.h
  F:    arch/arm/kernel/hw_breakpoint.c
  F:    arch/arm/include/asm/hw_breakpoint.h
@@@ -637,13 -607,6 +637,13 @@@ W:       http://www.arm.linux.org.uk
  S:    Maintained
  F:    arch/arm/
  
 +ARM SUB-ARCHITECTURES
 +L:    [email protected] (moderated for non-subscribers)
 +S:    MAINTAINED
 +F:    arch/arm/mach-*/
 +F:    arch/arm/plat-*/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
 +
  ARM PRIMECELL AACI PL041 DRIVER
  M:    Russell King <[email protected]>
  S:    Maintained
@@@ -695,6 -658,22 +695,6 @@@ W:        http://www.linux4sam.or
  S:    Supported
  F:    arch/arm/mach-at91/
  
 -ARM/BCMRING ARM ARCHITECTURE
 -M:    Jiandong Zheng <[email protected]>
 -M:    Scott Branden <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/mach-bcmring
 -
 -ARM/BCMRING MTD NAND DRIVER
 -M:    Jiandong Zheng <[email protected]>
 -M:    Scott Branden <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/mtd/nand/bcm_umi_nand.c
 -F:    drivers/mtd/nand/bcm_umi_bch.c
 -F:    drivers/mtd/nand/nand_bcm_umi.h
 -
  ARM/CALXEDA HIGHBANK ARCHITECTURE
  M:    Rob Herring <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -798,7 -777,6 +798,7 @@@ S: Maintaine
  T:    git git://git.pengutronix.de/git/imx/linux-2.6.git
  F:    arch/arm/mach-imx/
  F:    arch/arm/plat-mxc/
 +F:    arch/arm/configs/imx*_defconfig
  
  ARM/FREESCALE IMX6
  M:    Shawn Guo <[email protected]>
@@@ -841,14 -819,6 +841,14 @@@ T:       git git://git.kernel.org/pub/scm/lin
  F:    arch/arm/mach-sa1100/jornada720.c
  F:    arch/arm/mach-sa1100/include/mach/jornada720.h
  
 +ARM/IGEP MACHINE SUPPORT
 +M:    Enric Balletbo i Serra <[email protected]>
 +M:    Javier Martinez Canillas <[email protected]>
 +L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-omap2/board-igep0020.c
 +
  ARM/INCOME PXA270 SUPPORT
  M:    Marek Vasut <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -943,12 -913,6 +943,12 @@@ W:       http://www.digriz.org.uk/ts78xx/kern
  S:    Maintained
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 +ARM/MICREL KS8695 ARCHITECTURE
 +M:    Greg Ungerer <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +F:    arch/arm/mach-ks8695
 +S:    Odd Fixes
 +
  ARM/MIOA701 MACHINE SUPPORT
  M:    Robert Jarzmik <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1109,7 -1073,7 +1109,7 @@@ L:      [email protected]
  S:    Maintained
  F:    arch/arm/plat-s5p/dev-fimc*
  F:    arch/arm/plat-samsung/include/plat/*fimc*
 -F:    drivers/media/video/s5p-fimc/
 +F:    drivers/media/platform/s5p-fimc/
  
  ARM/SAMSUNG S5P SERIES Multi Format Codec (MFC) SUPPORT
  M:    Kyungmin Park <[email protected]>
@@@ -1119,7 -1083,7 +1119,7 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    arch/arm/plat-s5p/dev-mfc.c
 -F:    drivers/media/video/s5p-mfc/
 +F:    drivers/media/platform/s5p-mfc/
  
  ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
  M:    Kyungmin Park <[email protected]>
@@@ -1127,7 -1091,7 +1127,7 @@@ M:      Tomasz Stanislawski <t.stanislaws@sa
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/video/s5p-tv/
 +F:    drivers/media/platform/s5p-tv/
  
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Paul Mundt <[email protected]>
@@@ -1245,12 -1209,6 +1245,12 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/z2.c
  F:    arch/arm/mach-pxa/include/mach/z2.h
  
 +ARM64 PORT (AARCH64 ARCHITECTURE)
 +M:    Catalin Marinas <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm64/
 +
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <[email protected]>
  L:    [email protected]
@@@ -1292,7 -1250,7 +1292,7 @@@ F:      include/linux/i2c/at24.
  
  ATA OVER ETHERNET (AOE) DRIVER
  M:    "Ed L. Cashin" <[email protected]>
 -W:    http://www.coraid.com/support/linux
 +W:    http://support.coraid.com/support/linux
  S:    Supported
  F:    Documentation/aoe/
  F:    drivers/block/aoe/
@@@ -1399,7 -1357,7 +1399,7 @@@ ATMEL ISI DRIVE
  M:    Josh Wu <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/media/video/atmel-isi.c
 +F:    drivers/media/platform/atmel-isi.c
  F:    include/media/atmel-isi.h
  
  ATMEL LCDFB DRIVER
@@@ -1560,7 -1518,7 +1560,7 @@@ S:      Supporte
  F:    drivers/rtc/rtc-bfin.c
  
  BLACKFIN SDH DRIVER
 -M:    Cliff Cai <cliff.cai@analog.com>
 +M:    Sonic Zhang <sonic.zhang@analog.com>
  L:    [email protected]
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -1655,16 -1613,6 +1655,16 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2x/
  
 +BROADCOM BCM2835 ARM ARCHICTURE
 +M:    Stephen Warren <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
 +S:    Maintained
 +F:    arch/arm/mach-bcm2835/
 +F:    arch/arm/boot/dts/bcm2835*
 +F:    arch/arm/configs/bcm2835_defconfig
 +F:    drivers/*/*bcm2835*
 +
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Matt Carlson <[email protected]>
  M:    Michael Chan <[email protected]>
@@@ -1697,6 -1645,7 +1697,6 @@@ F:      drivers/bcma
  F:    include/linux/bcma/
  
  BROCADE BFA FC SCSI DRIVER
 -M:    Jing Huang <[email protected]>
  M:    Krishna C Gudipati <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -1746,7 -1695,7 +1746,7 @@@ W:      http://linuxtv.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/bttv/
 -F:    drivers/media/video/bt8xx/bttv*
 +F:    drivers/media/pci/bt8xx/bttv*
  
  C-MEDIA CMI8788 DRIVER
  M:    Clemens Ladisch <[email protected]>
@@@ -1776,7 -1725,7 +1776,7 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/cafe_ccic
 -F:    drivers/media/video/marvell-ccic/
 +F:    drivers/media/platform/marvell-ccic/
  
  CAIF NETWORK LAYER
  M:    Sjur Braendeland <[email protected]>
@@@ -1974,10 -1923,10 +1974,10 @@@ S:   Supporte
  F:    drivers/platform/x86/classmate-laptop.c
  
  COCCINELLE/Semantic Patches (SmPL)
 -M:    Julia Lawall <[email protected]>
 +M:    Julia Lawall <[email protected]>
  M:    Gilles Muller <[email protected]>
 -M:    Nicolas Palix <n[email protected]>
 -L:    cocci@diku.dk (moderated for non-subscribers)
 +M:    Nicolas Palix <n[email protected]>
 +L:    cocci@systeme.lip6.fr (moderated for non-subscribers)
  W:    http://coccinelle.lip6.fr/
  S:    Supported
  F:    scripts/coccinelle/
@@@ -2165,17 -2114,7 +2165,17 @@@ W:    http://linuxtv.or
  W:    http://www.ivtvdriver.org/index.php/Cx18
  S:    Maintained
  F:    Documentation/video4linux/cx18.txt
 -F:    drivers/media/video/cx18/
 +F:    drivers/media/pci/cx18/
 +
 +CXD2820R MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/cxd2820r*
  
  CXGB3 ETHERNET DRIVER (CXGB3)
  M:    Divy Le Ray <[email protected]>
@@@ -2439,6 -2378,11 +2439,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/dme1737
  F:    drivers/hwmon/dme1737.c
  
 -DOCBOOK FOR DOCUMENTATION
 -M:    Randy Dunlap <[email protected]>
 -S:    Maintained
 -F:    scripts/kernel-doc
 -
  DOCKING STATION DRIVER
  M:    Shaohua Li <[email protected]>
  L:    [email protected]
@@@ -2515,7 -2459,6 +2515,7 @@@ M:      Joonyoung Shim <jy0922.shim@samsung.
  M:    Seung-Woo Kim <[email protected]>
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
  S:    Supported
  F:    drivers/gpu/drm/exynos
  F:    include/drm/exynos*
@@@ -2526,117 -2469,6 +2526,117 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/net/wan/dscc4.c
  
 +DVB_USB_AF9015 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/af9015*
 +
 +DVB_USB_AF9035 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/af9035*
 +
 +DVB_USB_ANYSEE MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/anysee*
 +
 +DVB_USB_AU6610 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/au6610*
 +
 +DVB_USB_CE6230 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/ce6230*
 +
 +DVB_USB_CXUSB MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/cxusb*
 +
 +DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/cypress_firmware*
 +
 +DVB_USB_EC168 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/ec168*
 +
 +DVB_USB_MXL111SF MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/mxl111sf.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/mxl111sf*
 +
 +DVB_USB_RTL28XXU MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/rtl28xxu*
 +
 +DVB_USB_V2 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/usb/dvb-usb-v2/dvb_usb*
 +F:    drivers/media/usb/dvb-usb-v2/usb_urb.c
 +
  DYNAMIC DEBUG
  M:    Jason Baron <[email protected]>
  S:    Maintained
@@@ -2648,16 -2480,6 +2648,16 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
 +E4000 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/e4000*
 +
  EATA-DMA SCSI DRIVER
  M:    Michael Neuffer <[email protected]>
  L:    [email protected]
@@@ -2686,16 -2508,6 +2686,16 @@@ S:    Maintaine
  F:    include/linux/netfilter_bridge/ebt_*.h
  F:    net/bridge/netfilter/ebt*.c
  
 +EC100 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/ec100*
 +
  ECRYPT FILE SYSTEM
  M:    Tyler Hicks <[email protected]>
  M:    Dustin Kirkland <[email protected]>
@@@ -2716,10 -2528,10 +2716,10 @@@ F:   include/linux/edac.
  
  EDAC-AMD64
  M:    Doug Thompson <[email protected]>
 -M:    Borislav Petkov <b[email protected]>
 +M:    Borislav Petkov <b[email protected]>
  L:    [email protected]
  W:    bluesmoke.sourceforge.net
 -S:    Supported
 +S:    Maintained
  F:    drivers/edac/amd64_edac*
  
  EDAC-E752X
@@@ -2815,19 -2627,6 +2815,19 @@@ T:    git git://git.alsa-project.org/alsa-
  S:    Maintained
  F:    sound/usb/misc/ua101.c
  
 +EXTENSIBLE FIRMWARE INTERFACE (EFI)
 +M:    Matt Fleming <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi.git
 +S:    Maintained
 +F:    Documentation/x86/efi-stub.txt
 +F:    arch/ia64/kernel/efi.c
 +F:    arch/x86/boot/compressed/eboot.[ch]
 +F:    arch/x86/include/asm/efi.h
 +F:    arch/x86/platform/efi/*
 +F:    drivers/firmware/efivars.c
 +F:    include/linux/efi*.h
 +
  EFIFB FRAMEBUFFER DRIVER
  L:    [email protected]
  M:    Peter Jones <[email protected]>
@@@ -2979,18 -2778,8 +2979,18 @@@ FC0011 TUNER DRIVE
  M:    Michael Buesch <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/common/tuners/fc0011.h
 -F:    drivers/media/common/tuners/fc0011.c
 +F:    drivers/media/tuners/fc0011.h
 +F:    drivers/media/tuners/fc0011.c
 +
 +FC2580 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/fc2580*
  
  FANOTIFY
  M:    Eric Paris <[email protected]>
@@@ -3070,9 -2859,7 +3070,9 @@@ F:      include/linux/firewire*.
  F:    tools/firewire/
  
  FIRMWARE LOADER (request_firmware)
 -S:    Orphan
 +M:    Ming Lei <[email protected]>
 +L:    [email protected]
 +S:    Maintained
  F:    Documentation/firmware_class/
  F:    drivers/base/firmware*.c
  F:    include/linux/firmware.h
@@@ -3108,6 -2895,12 +3108,12 @@@ F:    drivers/video
  F:    include/video/
  F:    include/linux/fb.h
  
+ FREESCALE DIU FRAMEBUFFER DRIVER
+ M:    Timur Tabi <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/video/fsl-diu-fb.*
+ 
  FREESCALE DMA DRIVER
  M:    Li Yang <[email protected]>
  M:    Zhang Wei <[email protected]>
@@@ -3220,7 -3013,7 +3226,7 @@@ M:      Kyungmin Park <kyungmin.park@samsung
  M:    Heungjun Kim <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/video/m5mols/
 +F:    drivers/media/i2c/m5mols/
  F:    include/media/m5mols.h
  
  FUJITSU TABLET EXTRAS
@@@ -3318,7 -3111,6 +3324,7 @@@ T:      git git://git.secretlab.ca/git/linux
  F:    Documentation/gpio.txt
  F:    drivers/gpio/
  F:    include/linux/gpio*
 +F:    include/asm-generic/gpio.h
  
  GRE DEMULTIPLEXER DRIVER
  M:    Dmitry Kozlov <[email protected]>
@@@ -3338,56 -3130,49 +3344,56 @@@ M:   Frank Zago <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/finepix.c
 +F:    drivers/media/usb/gspca/finepix.c
  
  GSPCA GL860 SUBDRIVER
  M:    Olivier Lorin <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/gl860/
 +F:    drivers/media/usb/gspca/gl860/
  
  GSPCA M5602 SUBDRIVER
  M:    Erik Andren <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/m5602/
 +F:    drivers/media/usb/gspca/m5602/
  
  GSPCA PAC207 SONIXB SUBDRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/pac207.c
 +F:    drivers/media/usb/gspca/pac207.c
  
  GSPCA SN9C20X SUBDRIVER
  M:    Brian Johnson <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/sn9c20x.c
 +F:    drivers/media/usb/gspca/sn9c20x.c
  
  GSPCA T613 SUBDRIVER
  M:    Leandro Costantino <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/t613.c
 +F:    drivers/media/usb/gspca/t613.c
  
  GSPCA USB WEBCAM DRIVER
  M:    Hans de Goede <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/gspca/
 +F:    drivers/media/usb/gspca/
 +
 +STK1160 USB VIDEO CAPTURE DRIVER
 +M:    Ezequiel Garcia <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 +S:    Maintained
 +F:    drivers/media/usb/stk1160/
  
  HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER
  M:    Frank Seidel <[email protected]>
@@@ -3441,16 -3226,6 +3447,16 @@@ L:    [email protected]
  S:    Maintained
  F:    sound/parisc/harmony.*
  
 +HD29L2 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/hd29l2*
 +
  HEWLETT-PACKARD SMART2 RAID DRIVER
  M:    Chirag Kantharia <[email protected]>
  L:    [email protected]
@@@ -3606,49 -3381,6 +3612,49 @@@ F:    drivers/hid/hid-hyperv.
  F:    drivers/net/hyperv/
  F:    drivers/staging/hv/
  
 +I2C OVER PARALLEL PORT
 +M:    Jean Delvare <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-parport
 +F:    Documentation/i2c/busses/i2c-parport-light
 +F:    drivers/i2c/busses/i2c-parport.c
 +F:    drivers/i2c/busses/i2c-parport-light.c
 +
 +I2C/SMBUS CONTROLLER DRIVERS FOR PC
 +M:    Jean Delvare <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-ali1535
 +F:    Documentation/i2c/busses/i2c-ali1563
 +F:    Documentation/i2c/busses/i2c-ali15x3
 +F:    Documentation/i2c/busses/i2c-amd756
 +F:    Documentation/i2c/busses/i2c-amd8111
 +F:    Documentation/i2c/busses/i2c-i801
 +F:    Documentation/i2c/busses/i2c-nforce2
 +F:    Documentation/i2c/busses/i2c-piix4
 +F:    Documentation/i2c/busses/i2c-sis5595
 +F:    Documentation/i2c/busses/i2c-sis630
 +F:    Documentation/i2c/busses/i2c-sis96x
 +F:    Documentation/i2c/busses/i2c-via
 +F:    Documentation/i2c/busses/i2c-viapro
 +F:    drivers/i2c/busses/i2c-ali1535.c
 +F:    drivers/i2c/busses/i2c-ali1563.c
 +F:    drivers/i2c/busses/i2c-ali15x3.c
 +F:    drivers/i2c/busses/i2c-amd756.c
 +F:    drivers/i2c/busses/i2c-amd756-s4882.c
 +F:    drivers/i2c/busses/i2c-amd8111.c
 +F:    drivers/i2c/busses/i2c-i801.c
 +F:    drivers/i2c/busses/i2c-isch.c
 +F:    drivers/i2c/busses/i2c-nforce2.c
 +F:    drivers/i2c/busses/i2c-nforce2-s4985.c
 +F:    drivers/i2c/busses/i2c-piix4.c
 +F:    drivers/i2c/busses/i2c-sis5595.c
 +F:    drivers/i2c/busses/i2c-sis630.c
 +F:    drivers/i2c/busses/i2c-sis96x.c
 +F:    drivers/i2c/busses/i2c-via.c
 +F:    drivers/i2c/busses/i2c-viapro.c
 +
  I2C/SMBUS STUB DRIVER
  M:    "Mark M. Hoffman" <[email protected]>
  L:    [email protected]
@@@ -3656,25 -3388,19 +3662,25 @@@ S:   Maintaine
  F:    drivers/i2c/busses/i2c-stub.c
  
  I2C SUBSYSTEM
 -M:    "Jean Delvare (PC drivers, core)" <[email protected]>
 +M:    Wolfram Sang <[email protected]>
  M:    "Ben Dooks (embedded platforms)" <[email protected]>
 -M:    "Wolfram Sang (embedded platforms)" <[email protected]>
  L:    [email protected]
  W:    http://i2c.wiki.kernel.org/
  T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
 -T:    git git://git.fluff.org/bjdooks/linux.git
 +T:    git git://git.pengutronix.de/git/wsa/linux.git
  S:    Maintained
  F:    Documentation/i2c/
  F:    drivers/i2c/
  F:    include/linux/i2c.h
  F:    include/linux/i2c-*.h
  
 +I2C-TAOS-EVM DRIVER
 +M:    Jean Delvare <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/i2c/busses/i2c-taos-evm
 +F:    drivers/i2c/busses/i2c-taos-evm.c
 +
  I2C-TINY-USB DRIVER
  M:    Till Harbaum <[email protected]>
  L:    [email protected]
@@@ -3700,18 -3426,6 +3706,18 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    arch/ia64/
  
 +IBM Power in-Nest Crypto Acceleration
 +M:    Kent Yoder <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/crypto/nx/
 +
 +IBM Power 842 compression accelerator
 +M:    Robert Jennings <[email protected]>
 +S:    Supported
 +F:    drivers/crypto/nx/nx-842.c
 +F:    include/linux/nx842.h
 +
  IBM Power Linux RAID adapter
  M:    Brian King <[email protected]>
  S:    Supported
@@@ -3723,13 -3437,6 +3729,13 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
 +IBM Power Virtual SCSI/FC Device Drivers
 +M:    Robert Jennings <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/scsi/ibmvscsi/
 +X:    drivers/scsi/ibmvscsi/ibmvstgt.c
 +
  IBM ServeRAID RAID DRIVER
  P:    Jack Hammer
  M:    Dave Jeffery <[email protected]>
@@@ -3761,7 -3468,7 +3767,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/ideapad-laptop.c
  
  IDE/ATAPI DRIVERS
 -M:    Borislav Petkov <[email protected]>
 +M:    Borislav Petkov <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/cdrom/ide-cd
@@@ -3851,12 -3558,11 +3857,12 @@@ K:   \b(ABS|SYN)_MT
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <[email protected]>
 +M:    Lukasz Dorau <[email protected]>
 +M:    Maciej Patelczyk <[email protected]>
  M:    Dave Jiang <[email protected]>
 -M:    Ed Nadolski <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/isci.git
 -S:    Maintained
 +T:    git git://git.code.sf.net/p/intel-sas/isci
 +S:    Supported
  F:    drivers/scsi/isci/
  F:    firmware/isci/
  
@@@ -3966,12 -3672,11 +3972,12 @@@ F:   Documentation/networking/README.ipw2
  F:    drivers/net/wireless/ipw2x00/
  
  INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 -M:    Joseph Cihula <[email protected]>
 +M:    Richard L Maliszewski <[email protected]>
 +M:    Gang Wei <[email protected]>
  M:    Shane Wang <[email protected]>
  L:    [email protected]
  W:    http://tboot.sourceforge.net
 -T:    Mercurial http://www.bughost.org/repos.hg/tboot.hg
 +T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
  S:    Supported
  F:    Documentation/intel_txt.txt
  F:    include/linux/tboot.h
@@@ -4166,7 -3871,7 +4172,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://www.ivtvdriver.org
  S:    Maintained
  F:    Documentation/video4linux/*.ivtv
 -F:    drivers/media/video/ivtv/
 +F:    drivers/media/pci/ivtv/
  F:    include/linux/ivtv*
  
  JC42.4 TEMPERATURE SENSOR DRIVER
@@@ -4288,8 -3993,8 +4294,8 @@@ F:      include/linux/lockd
  F:    include/linux/sunrpc/
  
  KERNEL VIRTUAL MACHINE (KVM)
 -M:    Avi Kivity <[email protected]>
  M:    Marcelo Tosatti <[email protected]>
 +M:    Gleb Natapov <[email protected]>
  L:    [email protected]
  W:    http://kvm.qumranet.com
  S:    Supported
@@@ -4439,7 -4144,7 +4445,7 @@@ F:      Documentation/scsi/53c700.tx
  F:    drivers/scsi/53c700*
  
  LED SUBSYSTEM
 -M:    Bryan Wu <bryan.wu@canonical.com>
 +M:    Bryan Wu <cooloney@gmail.com>
  M:    Richard Purdie <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
@@@ -4460,26 -4165,6 +4466,26 @@@ W:    http://legousb.sourceforge.net
  S:    Maintained
  F:    drivers/usb/misc/legousbtower.c
  
 +LG2160 MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/lg2160.*
 +
 +LGDT3305 MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/lgdt3305.*
 +
  LGUEST
  M:    Rusty Russell <[email protected]>
  L:    [email protected]
@@@ -4882,7 -4567,7 +4888,7 @@@ MOTION EYE VAIO PICTUREBOOK CAMERA DRIV
  W:    http://popies.net/meye/
  S:    Orphan
  F:    Documentation/video4linux/meye.txt
 -F:    drivers/media/video/meye.*
 +F:    drivers/media/pci/meye/
  F:    include/linux/meye.h
  
  MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER
@@@ -4946,16 -4631,6 +4952,16 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Maintained
  F:    drivers/usb/musb/
  
 +MXL5007T MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/mxl5007t.*
 +
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
  M:    Andrew Gallatin <[email protected]>
  L:    [email protected]
@@@ -5086,20 -4761,6 +5092,20 @@@ F:    net/ipv6
  F:    include/net/ip*
  F:    arch/x86/net/*
  
 +NETWORKING [IPSEC]
 +M:    Steffen Klassert <[email protected]>
 +M:    Herbert Xu <[email protected]>
 +M:    "David S. Miller" <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +S:    Maintained
 +F:    net/xfrm/
 +F:    net/key/
 +F:    net/ipv4/xfrm*
 +F:    net/ipv6/xfrm*
 +F:    include/uapi/linux/xfrm.h
 +F:    include/net/xfrm.h
 +
  NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
  M:    Paul Moore <[email protected]>
  L:    [email protected]
@@@ -5127,13 -4788,7 +5133,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Odd Fixes
  F:    drivers/net/
  F:    include/linux/if_*
 -F:    include/linux/*device.h
 +F:    include/linux/netdevice.h
 +F:    include/linux/arcdevice.h
 +F:    include/linux/etherdevice.h
 +F:    include/linux/fcdevice.h
 +F:    include/linux/fddidevice.h
 +F:    include/linux/hippidevice.h
 +F:    include/linux/inetdevice.h
  
  NETXEN (1/10) GbE SUPPORT
  M:    Sony Chacko <[email protected]>
@@@ -5148,7 -4803,6 +5154,7 @@@ M:      Lauro Ramos Venancio <lauro.venancio
  M:    Aloisio Almeida Jr <[email protected]>
  M:    Samuel Ortiz <[email protected]>
  L:    [email protected]
 +L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    net/nfc/
  F:    include/linux/nfc.h
@@@ -5289,10 -4943,8 +5295,10 @@@ S:    Maintaine
  F:    drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
 +M:    Venkatraman S <[email protected]>
 +L:    [email protected]
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
@@@ -5318,7 -4970,7 +5324,7 @@@ OMAP IMAGE SIGNAL PROCESSOR (ISP
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/video/omap3isp/*
 +F:    drivers/media/platform/omap3isp/
  
  OMAP USB SUPPORT
  M:    Felipe Balbi <[email protected]>
@@@ -5359,7 -5011,7 +5365,7 @@@ M:      Jonathan Corbet <[email protected]
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    drivers/media/video/ov7670.c
 +F:    drivers/media/i2c/ov7670.c
  
  ONENAND FLASH DRIVER
  M:    Kyungmin Park <[email protected]>
@@@ -5393,7 -5045,6 +5399,7 @@@ S:      Maintaine
  F:    Documentation/devicetree
  F:    drivers/of
  F:    include/linux/of*.h
 +F:    scripts/dtc
  K:    of_get_property
  K:    of_match_table
  
@@@ -5421,7 -5072,7 +5427,7 @@@ S:      Maintaine
  F:    sound/drivers/opl4/
  
  OPROFILE
 -M:    Robert Richter <r[email protected]>
 +M:    Robert Richter <r[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    arch/*/include/asm/oprofile*.h
@@@ -5579,7 -5230,7 +5585,7 @@@ F:      include/linux/i2c-algo-pca.
  F:    include/linux/i2c-pca-platform.h
  
  PCDP - PRIMARY CONSOLE AND DEBUG PORT
 -M:    Khalid Aziz <khalid[email protected]>
 +M:    Khalid Aziz <khalid@gonehiking.org>
  S:    Maintained
  F:    drivers/firmware/pcdp.*
  
@@@ -5675,12 -5326,6 +5681,12 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/mtd/devices/phram.c
  
 +PICOLCD HID DRIVER
 +M:    Bruno Prémont <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hid/hid-picolcd*
 +
  PICOXCELL SUPPORT
  M:    Jamie Iles <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -5705,7 -5350,7 +5711,7 @@@ S:      Maintaine
  F:    drivers/pinctrl/spear/
  
  PKTCDVD DRIVER
 -M:    Peter Osterlund <[email protected]>
 +M:    Jiri Kosina <[email protected]>
  S:    Maintained
  F:    drivers/block/pktcdvd.c
  F:    include/linux/pktcdvd.h
@@@ -5862,25 -5507,13 +5868,25 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/block/ps3vram.c
  
 +PSTORE FILESYSTEM
 +M:    Anton Vorontsov <[email protected]>
 +M:    Colin Cross <[email protected]>
 +M:    Kees Cook <[email protected]>
 +M:    Tony Luck <[email protected]>
 +S:    Maintained
 +T:    git git://git.infradead.org/users/cbou/linux-pstore.git
 +F:    fs/pstore/
 +F:    include/linux/pstore*
 +F:    drivers/firmware/efivars.c
 +F:    drivers/acpi/apei/erst.c
 +
  PTP HARDWARE CLOCK SUPPORT
  M:    Richard Cochran <[email protected]>
  S:    Maintained
  W:    http://linuxptp.sourceforge.net/
  F:    Documentation/ABI/testing/sysfs-ptp
  F:    Documentation/ptp/*
 -F:    drivers/net/gianfar_ptp.c
 +F:    drivers/net/ethernet/freescale/gianfar_ptp.c
  F:    drivers/net/phy/dp83640*
  F:    drivers/ptp/*
  F:    include/linux/ptp_cl*
@@@ -5903,7 -5536,7 +5909,7 @@@ W:      http://www.isely.net/pvrusb2
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
  F:    Documentation/video4linux/README.pvrusb2
 -F:    drivers/media/video/pvrusb2/
 +F:    drivers/media/usb/pvrusb2/
  
  PWM SUBSYSTEM
  M:    Thierry Reding <[email protected]>
@@@ -5916,8 -5549,6 +5922,8 @@@ F:      Documentation/devicetree/bindings/pw
  F:    include/linux/pwm.h
  F:    include/linux/of_pwm.h
  F:    drivers/pwm/
 +F:    drivers/video/backlight/pwm_bl.c
 +F:    include/linux/pwm_backlight.h
  
  PXA2xx/PXA3xx SUPPORT
  M:    Eric Miao <[email protected]>
@@@ -6013,16 -5644,6 +6019,16 @@@ F:    fs/qnx4
  F:    include/linux/qnx4_fs.h
  F:    include/linux/qnxtypes.h
  
 +QT1010 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/qt1010*
 +
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <[email protected]>
  L:    [email protected]
@@@ -6189,16 -5810,6 +6195,16 @@@ F:    include/linux/rose.
  F:    include/net/rose.h
  F:    net/rose/
  
 +RTL2830 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/rtl2830*
 +
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <[email protected]>
  L:    [email protected]
@@@ -6293,9 -5904,9 +6299,9 @@@ L:      [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
 -F:    drivers/media/common/saa7146*
 -F:    drivers/media/video/*7146*
 -F:    include/media/*7146*
 +F:    drivers/media/common/saa7146/
 +F:    drivers/media/pci/saa7146/
 +F:    include/media/saa7146*
  
  SAMSUNG LAPTOP DRIVER
  M:    Corentin Chary <[email protected]>
@@@ -6332,7 -5943,7 +6338,7 @@@ S:      Maintaine
  F:    drivers/tty/serial
  
  SYNOPSYS DESIGNWARE DMAC DRIVER
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  S:    Maintained
  F:    include/linux/dw_dmac.h
  F:    drivers/dma/dw_dmac_regs.h
@@@ -6356,7 -5967,7 +6362,7 @@@ M:      Huang Shijie <[email protected]
  M:    Kang Yong <[email protected]>
  M:    Zhang Xiaobing <[email protected]>
  S:    Supported
 -F:    drivers/media/video/tlg2300
 +F:    drivers/media/usb/tlg2300
  
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <[email protected]>
@@@ -6480,7 -6091,7 +6486,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/sdhci-s3c.c
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) ST SPEAR DRIVER
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -6744,9 -6355,8 +6750,9 @@@ M:      Guennadi Liakhovetski <g.liakhovetsk
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  S:    Maintained
 -F:    include/media/v4l2*
 -F:    drivers/media/video/v4l2*
 +F:    include/media/soc*
 +F:    drivers/media/i2c/soc_camera/
 +F:    drivers/media/platform/soc_camera/
  
  SOEKRIS NET48XX LED SUPPORT
  M:    Chris Boot <[email protected]>
@@@ -6846,7 -6456,7 +6852,7 @@@ S:      Maintaine
  F:    include/linux/compiler.h
  
  SPEAR PLATFORM SUPPORT
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  M:    Shiraz Hashim <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -6855,7 -6465,7 +6861,7 @@@ S:      Maintaine
  F:    arch/arm/plat-spear/
  
  SPEAR13XX MACHINE SUPPORT
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  M:    Shiraz Hashim <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -6864,7 -6474,7 +6870,7 @@@ S:      Maintaine
  F:    arch/arm/mach-spear13xx/
  
  SPEAR3XX MACHINE SUPPORT
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  M:    Shiraz Hashim <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -6875,7 -6485,7 +6881,7 @@@ F:      arch/arm/mach-spear3xx
  SPEAR6XX MACHINE SUPPORT
  M:    Rajeev Kumar <[email protected]>
  M:    Shiraz Hashim <[email protected]>
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -6883,7 -6493,7 +6889,7 @@@ S:      Maintaine
  F:    arch/arm/mach-spear6xx/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
 -M:     Viresh Kumar <[email protected]>
 +M:    Viresh Kumar <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  W:    http://www.st.com/spear
@@@ -7123,14 -6733,6 +7129,14 @@@ S:    Maintaine
  F:    Documentation/svga.txt
  F:    arch/x86/boot/video*
  
 +SWIOTLB SUBSYSTEM
 +M:    Konrad Rzeszutek Wilk <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    lib/swiotlb.c
 +F:    arch/*/kernel/pci-swiotlb.c
 +F:    include/linux/swiotlb.h
 +
  SYSV FILESYSTEM
  M:    Christoph Hellwig <[email protected]>
  S:    Maintained
@@@ -7172,66 -6774,6 +7178,66 @@@ W:    http://tcp-lp-mod.sourceforge.net
  S:    Maintained
  F:    net/ipv4/tcp_lp.c
  
 +TDA10071 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/dvb-frontends/tda10071*
 +
 +TDA18212 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18212*
 +
 +TDA18218 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18218*
 +
 +TDA18271 MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda18271*
 +
 +TDA827x MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda8290.*
 +
 +TDA8290 MEDIA DRIVER
 +M:    Michael Krufky <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://github.com/mkrufky
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mkrufky/tuners.git
 +S:    Maintained
 +F:    drivers/media/tuners/tda8290.*
 +
  TEAM DRIVER
  M:    Jiri Pirko <[email protected]>
  L:    [email protected]
@@@ -7240,14 -6782,14 +7246,14 @@@ F:   drivers/net/team
  F:    include/linux/if_team.h
  
  TEGRA SUPPORT
 -M:    Colin Cross <[email protected]>
 -M:    Olof Johansson <[email protected]>
  M:    Stephen Warren <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.ozlabs.org/project/linux-tegra/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
  S:    Supported
  F:    arch/arm/mach-tegra
 +F:    arch/arm/boot/dts/tegra*
 +F:    arch/arm/configs/tegra_defconfig
  
  TEHUTI ETHERNET DRIVER
  M:    Andy Gospodarek <[email protected]>
@@@ -7262,19 -6804,9 +7268,19 @@@ F:    drivers/char/tlclk.
  
  TENSILICA XTENSA PORT (xtensa)
  M:    Chris Zankel <[email protected]>
 +M:    Max Filippov <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    arch/xtensa/
  
 +THERMAL
 +M:      Zhang Rui <[email protected]>
 +L:      [email protected]
 +T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 +S:      Supported
 +F:      drivers/thermal/
 +F:      include/linux/thermal.h
 +
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <[email protected]>
  L:    [email protected]
@@@ -7432,16 -6964,6 +7438,16 @@@ F:    include/linux/serial_core.
  F:    include/linux/serial.h
  F:    include/linux/tty.h
  
 +TUA9001 MEDIA DRIVER
 +M:    Antti Palosaari <[email protected]>
 +L:    [email protected]
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/media/tuners/tua9001*
 +
  TULIP NETWORK DRIVERS
  M:    Grant Grundler <[email protected]>
  L:    [email protected]
@@@ -7559,12 -7081,6 +7565,12 @@@ F:    drivers/mtd/ubi
  F:    include/linux/mtd/ubi.h
  F:    include/mtd/ubi-user.h
  
 +UNSORTED BLOCK IMAGES (UBI) Fastmap
 +M:    Richard Weinberger <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/ubi/fastmap.c
 +
  USB ACM DRIVER
  M:    Oliver Neukum <[email protected]>
  L:    [email protected]
@@@ -7620,6 -7136,15 +7626,6 @@@ S:     Maintaine
  F:    Documentation/usb/ehci.txt
  F:    drivers/usb/host/ehci*
  
 -USB ET61X[12]51 DRIVER
 -M:    Luca Risolia <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 -W:    http://www.linux-projects.org
 -S:    Maintained
 -F:    drivers/media/video/et61x251/
 -
  USB GADGET/PERIPHERAL SUBSYSTEM
  M:    Felipe Balbi <[email protected]>
  L:    [email protected]
@@@ -7789,7 -7314,7 +7795,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://www.linux-projects.org
  S:    Maintained
  F:    Documentation/video4linux/sn9c102.txt
 -F:    drivers/media/video/sn9c102/
 +F:    drivers/media/usb/sn9c102/
  
  USB SUBSYSTEM
  M:    Greg Kroah-Hartman <[email protected]>
@@@ -7824,14 -7349,17 +7830,14 @@@ L:   [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
  W:    http://www.ideasonboard.org/uvc/
  S:    Maintained
 -F:    drivers/media/video/uvc/
 +F:    drivers/media/usb/uvc/
  
 -USB W996[87]CF DRIVER
 -M:    Luca Risolia <[email protected]>
 +USB WEBCAM GADGET
 +M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
 -L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media.git
 -W:    http://www.linux-projects.org
  S:    Maintained
 -F:    Documentation/video4linux/w9968cf.txt
 -F:    drivers/media/video/w996*
 +F:    drivers/usb/gadget/*uvc*.c
 +F:    drivers/usb/gadget/webcam.c
  
  USB WIRELESS RNDIS DRIVER (rndis_wlan)
  M:    Jussi Kivilinna <[email protected]>
@@@ -7860,7 -7388,7 +7866,7 @@@ T:      git git://git.kernel.org/pub/scm/lin
  W:    http://royale.zerezo.com/zr364xx/
  S:    Maintained
  F:    Documentation/video4linux/zr364xx.txt
 -F:    drivers/media/video/zr364xx.c
 +F:    drivers/media/usb/zr364xx/
  
  USER-MODE LINUX (UML)
  M:    Jeff Dike <[email protected]>
@@@ -7918,7 -7446,7 +7924,7 @@@ M:      Marek Szyprowski <m.szyprowski@samsu
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/media/video/videobuf2-*
 +F:    drivers/media/v4l2-core/videobuf2-*
  F:    include/media/videobuf2-*
  
  VIRTIO CONSOLE DRIVER
@@@ -7952,6 -7480,13 +7958,6 @@@ M:     Roger Luethi <[email protected]
  S:    Maintained
  F:    drivers/net/ethernet/via/via-rhine.c
  
 -VIAPRO SMBUS DRIVER
 -M:    Jean Delvare <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/i2c/busses/i2c-viapro
 -F:    drivers/i2c/busses/i2c-viapro.c
 -
  VIA SD/MMC CARD CONTROLLER DRIVER
  M:    Bruce Chang <[email protected]>
  M:    Harald Welte <[email protected]>
@@@ -8206,7 -7741,7 +8212,7 @@@ F:      drivers/platform/x8
  
  X86 MCE INFRASTRUCTURE
  M:    Tony Luck <[email protected]>
 -M:    Borislav Petkov <bp@amd64.org>
 +M:    Borislav Petkov <bp@alien8.de>
  L:    [email protected]
  S:    Maintained
  F:    arch/x86/kernel/cpu/mcheck/*
@@@ -8223,13 -7758,6 +8229,13 @@@ F:    drivers/xen
  F:    arch/x86/include/asm/xen/
  F:    include/xen/
  
 +XEN HYPERVISOR ARM
 +M:    Stefano Stabellini <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    arch/arm/xen/
 +F:    arch/arm/include/asm/xen/
 +
  XEN NETWORK BACKEND DRIVER
  M:    Ian Campbell <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -8320,7 -7848,7 +8326,7 @@@ L:      [email protected]
  W:    http://mjpeg.sourceforge.net/driver-zoran/
  T:    Mercurial http://linuxtv.org/hg/v4l-dvb
  S:    Odd Fixes
 -F:    drivers/media/video/zoran/
 +F:    drivers/media/pci/zoran/
  
  ZS DECSTATION Z85C30 SERIAL DRIVER
  M:    "Maciej W. Rozycki" <[email protected]>