ARM: dts: Enable UART wake-up events for beagleboard

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6d383ec8325aca1789a912aae803a779104d7b9f..1ff06dee651d5da4806dfcec1ab12e8281110e58 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -70,6 +70,8 @@ Descriptions of section entries:
 
        P: Person (obsolete)
        M: Mail patches to: FullName <address@domain>
+       R: Designated reviewer: FullName <address@domain>
+          These reviewers should be CCed on patches.
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
        Q: Patchwork web based patch tracking system site
@@ -148,6 +150,14 @@ L: [email protected]
 S:     Maintained
 F:     drivers/scsi/53c700*
 
+6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
+M:     Alexander Aring <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+L:     [email protected]
+S:     Maintained
+F:     net/6lowpan/
+F:     include/net/6lowpan.h
+
 6PACK NETWORK DRIVER FOR AX.25
 M:     Andreas Koensgen <[email protected]>
 L:     [email protected]
@@ -514,6 +524,16 @@ S: Supported
 F:     fs/aio.c
 F:     include/linux/*aio*.h
 
+AIRSPY 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/airspy/
+
 ALCATEL SPEEDTOUCH USB DRIVER
 M:     Duncan Sands <[email protected]>
 L:     [email protected]
@@ -577,7 +597,7 @@ AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 M:     Thomas Dahlmann <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Supported
-F:     drivers/usb/gadget/amd5536udc.*
+F:     drivers/usb/gadget/udc/amd5536udc.*
 
 AMD GEODE PROCESSOR/CHIPSET SUPPORT
 P:     Andres Salomon <[email protected]>
@@ -586,7 +606,7 @@ W:  http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_
 S:     Supported
 F:     drivers/char/hw_random/geode-rng.c
 F:     drivers/crypto/geode*
-F:     drivers/video/geode/
+F:     drivers/video/fbdev/geode/
 F:     arch/x86/include/asm/geode.h
 
 AMD IOMMU (AMD-VI)
@@ -601,7 +621,7 @@ AMD MICROCODE UPDATE SUPPORT
 M:     Andreas Herrmann <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     arch/x86/kernel/microcode_amd.c
+F:     arch/x86/kernel/cpu/microcode/amd*
 
 AMD XGBE DRIVER
 M:     Tom Lendacky <[email protected]>
@@ -699,6 +719,14 @@ S: Maintained
 F:     drivers/net/appletalk/
 F:     net/appletalk/
 
+APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
+M:     Iyappan Subramanian <[email protected]>
+M:     Keyur Chudgar <[email protected]>
+M:     Ravi Patel <[email protected]>
+S:     Supported
+F:     drivers/net/ethernet/apm/xgene/
+F:     Documentation/devicetree/bindings/net/apm-xgene-enet.txt
+
 APTINA CAMERA SENSOR PLL
 M:     Laurent Pinchart <[email protected]>
 L:     [email protected]
@@ -715,8 +743,8 @@ F:  drivers/ata/pata_arasan_cf.c
 ARC FRAMEBUFFER DRIVER
 M:     Jaya Kumar <[email protected]>
 S:     Maintained
-F:     drivers/video/arcfb.c
-F:     drivers/video/fb_defio.c
+F:     drivers/video/fbdev/arcfb.c
+F:     drivers/video/fbdev/core/fb_defio.c
 
 ARM MFM AND FLOPPY DRIVERS
 M:     Ian Molton <[email protected]>
@@ -755,7 +783,7 @@ F:  sound/arm/aaci.*
 ARM PRIMECELL CLCD PL110 DRIVER
 M:     Russell King <[email protected]>
 S:     Maintained
-F:     drivers/video/amba-clcd.*
+F:     drivers/video/fbdev/amba-clcd.*
 
 ARM PRIMECELL KMI PL050 DRIVER
 M:     Russell King <[email protected]>
@@ -891,7 +919,7 @@ L:  [email protected] (moderated for non-subscribers)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux.git
 S:     Maintained
 F:     arch/arm/mach-prima2/
-F:     drivers/clk/clk-prima2.c
+F:     drivers/clk/sirf/
 F:     drivers/clocksource/timer-prima2.c
 F:     drivers/clocksource/timer-marco.c
 N:     [^a-z]sirf
@@ -965,6 +993,14 @@ F: arch/arm/mach-pxa/hx4700.c
 F:     arch/arm/mach-pxa/include/mach/hx4700.h
 F:     sound/soc/pxa/hx4700.c
 
+ARM/HISILICON SOC SUPPORT
+M:     Wei Xu <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+W:     http://www.hisilicon.com
+S:     Supported
+T:     git git://github.com/hisilicon/linux-hisi.git
+F:     arch/arm/mach-hisi/
+
 ARM/HP JORNADA 7XX MACHINE SUPPORT
 M:     Kristoffer Ericson <[email protected]>
 W:     www.jlime.com
@@ -1096,14 +1132,13 @@ L:      [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-berlin/
 
-ARM/Marvell Dove/Kirkwood/MV78xx0/Orion SOC support
+ARM/Marvell Dove/MV78xx0/Orion SOC support
 M:     Jason Cooper <[email protected]>
 M:     Andrew Lunn <[email protected]>
 M:     Sebastian Hesselbarth <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-dove/
-F:     arch/arm/mach-kirkwood/
 F:     arch/arm/mach-mv78xx0/
 F:     arch/arm/mach-orion5x/
 F:     arch/arm/plat-orion/
@@ -1137,6 +1172,7 @@ M:        Linus Walleij <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-nomadik/
+F:     drivers/pinctrl/nomadik/
 F:     drivers/i2c/busses/i2c-nomadik.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git
 
@@ -1152,14 +1188,13 @@ M:      Daniel Walker <[email protected]>
 M:     Bryan Huntsman <[email protected]>
 L:     [email protected]
 F:     arch/arm/mach-msm/
-F:     drivers/video/msm/
+F:     drivers/video/fbdev/msm/
 F:     drivers/mmc/host/msm_sdcc.c
 F:     drivers/mmc/host/msm_sdcc.h
 F:     drivers/tty/serial/msm_serial.h
 F:     drivers/tty/serial/msm_serial.c
 F:     drivers/*/pm8???-*
-F:     drivers/mfd/ssbi/
-F:     include/linux/mfd/pm8xxx/
+F:     drivers/mfd/ssbi.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
 S:     Maintained
 
@@ -1242,6 +1277,7 @@ F:        drivers/scsi/arm/
 ARM/Rockchip SoC support
 M:     Heiko Stuebner <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
+L:     [email protected]
 S:     Maintained
 F:     arch/arm/mach-rockchip/
 F:     drivers/*/*rockchip*
@@ -1356,6 +1392,7 @@ F:        drivers/pinctrl/pinctrl-st.c
 F:     drivers/media/rc/st_rc.c
 F:     drivers/i2c/busses/i2c-st.c
 F:     drivers/tty/serial/st-asc.c
+F:     drivers/mmc/host/sdhci-st.c
 
 ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
 M:     Lennert Buytenhek <[email protected]>
@@ -1386,7 +1423,7 @@ F:        drivers/mtd/nand/nuc900_nand.c
 F:     drivers/rtc/rtc-nuc900.c
 F:     drivers/spi/spi-nuc900.c
 F:     drivers/usb/host/ehci-w90x900.c
-F:     drivers/video/nuc900fb.c
+F:     drivers/video/fbdev/nuc900fb.c
 
 ARM/U300 MACHINE SUPPORT
 M:     Linus Walleij <[email protected]>
@@ -1415,7 +1452,8 @@ F:        drivers/mfd/abx500*
 F:     drivers/mfd/ab8500*
 F:     drivers/mfd/dbx500*
 F:     drivers/mfd/db8500*
-F:     drivers/pinctrl/pinctrl-nomadik*
+F:     drivers/pinctrl/nomadik/pinctrl-ab*
+F:     drivers/pinctrl/nomadik/pinctrl-nomadik*
 F:     drivers/rtc/rtc-ab8500.c
 F:     drivers/rtc/rtc-pl031.c
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git
@@ -1455,9 +1493,9 @@ F:        drivers/rtc/rtc-vt8500.c
 F:     drivers/tty/serial/vt8500_serial.c
 F:     drivers/usb/host/ehci-platform.c
 F:     drivers/usb/host/uhci-platform.c
-F:     drivers/video/vt8500lcdfb.*
-F:     drivers/video/wm8505fb*
-F:     drivers/video/wmt_ge_rops.*
+F:     drivers/video/fbdev/vt8500lcdfb.*
+F:     drivers/video/fbdev/wm8505fb*
+F:     drivers/video/fbdev/wmt_ge_rops.*
 
 ARM/ZIPIT Z2 SUPPORT
 M:     Marek Vasut <[email protected]>
@@ -1647,7 +1685,7 @@ ATMEL LCDFB DRIVER
 M:     Nicolas Ferre <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/atmel_lcdfb.c
+F:     drivers/video/fbdev/atmel_lcdfb.c
 F:     include/video/atmel_lcdc.h
 
 ATMEL MACB ETHERNET DRIVER
@@ -1671,7 +1709,7 @@ ATMEL USBA UDC DRIVER
 M:     Nicolas Ferre <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 S:     Supported
-F:     drivers/usb/gadget/atmel_usba_udc.*
+F:     drivers/usb/gadget/udc/atmel_usba_udc.*
 
 ATMEL WIRELESS DRIVER
 M:     Simon Kelley <[email protected]>
@@ -1794,11 +1832,24 @@ W:      http://bcache.evilpiepirate.org
 S:     Maintained:
 F:     drivers/md/bcache/
 
+BECEEM BCS200/BCS220-3/BCSM250 WIMAX SUPPORT
+M: Kevin McKinney <[email protected]>
+M: Matthias Beyer <[email protected]>
+L: [email protected]
+S: Maintained
+F: drivers/staging/bcm*
+
 BEFS FILE SYSTEM
 S:     Orphan
 F:     Documentation/filesystems/befs.txt
 F:     fs/befs/
 
+BECKHOFF CX5020 ETHERCAT MASTER DRIVER
+M: Dariusz Marcinkiewicz <[email protected]>
+L: [email protected]
+S: Maintained
+F: drivers/net/ethernet/ec_bhf.c
+
 BFS FILE SYSTEM
 M:     "Tigran A. Aivazian" <[email protected]>
 S:     Maintained
@@ -1912,6 +1963,13 @@ S:       Supported
 F:     drivers/net/bonding/
 F:     include/uapi/linux/if_bonding.h
 
+BPF (Safe dynamic programs and tools)
+M:     Alexei Starovoitov <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Supported
+F:     kernel/bpf/
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Gary Zambrano <[email protected]>
 L:     [email protected]
@@ -1925,7 +1983,8 @@ S:        Supported
 F:     drivers/net/ethernet/broadcom/genet/
 
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-M:     Michael Chan <[email protected]>
+M:     Sony Chacko <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2.*
@@ -1948,7 +2007,7 @@ F:        arch/arm/boot/dts/bcm113*
 F:     arch/arm/boot/dts/bcm216*
 F:     arch/arm/boot/dts/bcm281*
 F:     arch/arm/configs/bcm_defconfig
-F:     drivers/mmc/host/sdhci_bcm_kona.c
+F:     drivers/mmc/host/sdhci-bcm-kona.c
 F:     drivers/clocksource/bcm_kona_timer.c
 
 BROADCOM BCM2835 ARM ARCHICTURE
@@ -1969,8 +2028,16 @@ F:       arch/arm/mach-bcm/bcm_5301x.c
 F:     arch/arm/boot/dts/bcm5301x.dtsi
 F:     arch/arm/boot/dts/bcm470*
 
+BROADCOM BCM7XXX ARM ARCHITECTURE
+M:     Marc Carino <[email protected]>
+M:     Brian Norris <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-bcm/*brcmstb*
+F:     arch/arm/boot/dts/bcm7*.dts*
+
 BROADCOM TG3 GIGABIT ETHERNET DRIVER
-M:     Nithin Nayak Sujir <nsujir@broadcom.com>
+M:     Prashant Sreedharan <prashant@broadcom.com>
 M:     Michael Chan <[email protected]>
 L:     [email protected]
 S:     Supported
@@ -1987,19 +2054,19 @@ S:      Supported
 F:     drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
-M:     Eddie Wai <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/bnx2fc/
 
 BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
-M:     Eddie Wai <[email protected]>
+M:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/bnx2i/
 
 BROADCOM KONA GPIO DRIVER
-M:     Markus Mayer <[email protected]>
+M:     Ray Jui <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/gpio/gpio-bcm-kona.c
@@ -2290,12 +2357,6 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/net/ethernet/cirrus/ep93xx_eth.c
 
-CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
-M:     Lennert Buytenhek <[email protected]>
-L:     [email protected]
-S:     Maintained
-F:     drivers/usb/host/ohci-ep93xx.c
-
 CIRRUS LOGIC AUDIO CODEC DRIVERS
 M:     Brian Austin <[email protected]>
 M:     Paul Handrigan <[email protected]>
@@ -2380,7 +2441,7 @@ W:        http://linux-cifs.samba.org/
 Q:     http://patchwork.ozlabs.org/project/linux-cifs-client/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
 S:     Supported
-F:     Documentation/filesystems/cifs.txt
+F:     Documentation/filesystems/cifs/
 F:     fs/cifs/
 
 COMPACTPCI HOTPLUG CORE
@@ -2521,8 +2582,8 @@ F:        arch/x86/kernel/cpuid.c
 F:     arch/x86/kernel/msr.c
 
 CPU POWER MONITORING SUBSYSTEM
-M:     Dominik Brodowski <[email protected]>
 M:     Thomas Renninger <[email protected]>
+L:     [email protected]
 S:     Maintained
 F:     tools/power/cpupower/
 
@@ -2657,7 +2718,7 @@ M:        Russell King <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
-F:     drivers/video/cyber2000fb.*
+F:     drivers/video/fbdev/cyber2000fb.*
 
 CYCLADES ASYNC MUX DRIVER
 W:     http://www.cyclades.com/
@@ -2857,6 +2918,7 @@ F:        drivers/staging/dgnc/
 DIGI EPCA PCI PRODUCTS
 M:     Lidza Louina <[email protected]>
 M:     Mark Hounschell <[email protected]>
+M:     Daeseok Youn <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/staging/dgap/
@@ -2894,7 +2956,7 @@ M:        Bernie Thompson <[email protected]>
 L:     [email protected]
 S:     Maintained
 W:     http://plugable.com/category/projects/udlfb/
-F:     drivers/video/udlfb.c
+F:     drivers/video/fbdev/udlfb.c
 F:     include/video/udlfb.h
 F:     Documentation/fb/udlfb.txt
 
@@ -2913,8 +2975,10 @@ S:       Maintained
 L:     [email protected]
 L:     [email protected]
 L:     [email protected]
-F:     drivers/base/dma-buf*
+F:     drivers/dma-buf/
 F:     include/linux/dma-buf*
+F:     include/linux/reservation.h
+F:     include/linux/*fence.h
 F:     Documentation/dma-buf-sharing.txt
 T:     git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git
 
@@ -3009,7 +3073,6 @@ L:        [email protected]
 T:     git git://people.freedesktop.org/~agd5f/linux
 S:     Supported
 F:     drivers/gpu/drm/radeon/
-F:     include/drm/radeon*
 F:     include/uapi/drm/radeon*
 
 DRM PANEL DRIVERS
@@ -3059,6 +3122,17 @@ F:       include/linux/host1x.h
 F:     include/uapi/drm/tegra_drm.h
 F:     Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
 
+DRM DRIVERS FOR RENESAS
+M:     Laurent Pinchart <[email protected]>
+L:     [email protected]
+L:     [email protected]
+T:     git git://people.freedesktop.org/~airlied/linux
+S:     Supported
+F:     drivers/gpu/drm/rcar-du/
+F:     drivers/gpu/drm/shmobile/
+F:     include/linux/platform_data/rcar-du.h
+F:     include/linux/platform_data/shmob_drm.h
+
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <[email protected]>
 L:     [email protected]
@@ -3203,26 +3277,12 @@ 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]
-L:     [email protected]
-S:     Maintained
-F:     drivers/scsi/eata*
-
 EATA ISA/EISA/PCI SCSI DRIVER
 M:     Dario Ballabio <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/scsi/eata.c
 
-EATA-PIO SCSI DRIVER
-M:     Michael Neuffer <[email protected]>
-L:     [email protected]
-L:     [email protected]
-S:     Maintained
-F:     drivers/scsi/eata_pio.*
-
 EC100 MEDIA DRIVER
 M:     Antti Palosaari <[email protected]>
 L:     [email protected]
@@ -3350,6 +3410,13 @@ W:       bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82975x_edac.c
 
+EDAC-IE31200
+M:     Jason Baron <[email protected]>
+L:     [email protected]
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+F:     drivers/edac/ie31200_edac.c
+
 EDAC-MPC85XX
 M:     Johannes Thumshirn <[email protected]>
 L:     [email protected]
@@ -3390,7 +3457,7 @@ 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:     Documentation/efi-stub.txt
 F:     arch/ia64/kernel/efi.c
 F:     arch/x86/boot/compressed/eboot.[ch]
 F:     arch/x86/include/asm/efi.h
@@ -3411,7 +3478,7 @@ EFIFB FRAMEBUFFER DRIVER
 L:     [email protected]
 M:     Peter Jones <[email protected]>
 S:     Maintained
-F:     drivers/video/efifb.c
+F:     drivers/video/fbdev/efifb.c
 
 EFS FILESYSTEM
 W:     http://aeschi.ch.eu.org/efs/
@@ -3476,7 +3543,7 @@ EPSON S1D13XXX FRAMEBUFFER DRIVER
 M:     Kristoffer Ericson <[email protected]>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
-F:     drivers/video/s1d13xxxfb.c
+F:     drivers/video/fbdev/s1d13xxxfb.c
 F:     include/video/s1d13xxxfb.h
 
 ETHERNET BRIDGE
@@ -3554,7 +3621,7 @@ M:        Donghwa Lee <[email protected]>
 M:     Kyungmin Park <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/exynos/exynos_mipi*
+F:     drivers/video/fbdev/exynos/exynos_mipi*
 F:     include/video/exynos_mipi*
 
 F71805F HARDWARE MONITORING DRIVER
@@ -3733,7 +3800,7 @@ FREESCALE DIU FRAMEBUFFER DRIVER
 M:     Timur Tabi <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/fsl-diu-fb.*
+F:     drivers/video/fbdev/fsl-diu-fb.*
 
 FREESCALE DMA DRIVER
 M:     Li Yang <[email protected]>
@@ -3755,7 +3822,7 @@ L:        [email protected]
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
 F:     include/linux/platform_data/video-imxfb.h
-F:     drivers/video/imxfb.c
+F:     drivers/video/fbdev/imxfb.c
 
 FREESCALE SOC FS_ENET DRIVER
 M:     Pantelis Antoniou <[email protected]>
@@ -3777,7 +3844,7 @@ M:        Li Yang <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
-F:     drivers/usb/gadget/fsl*
+F:     drivers/usb/gadget/udc/fsl*
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:     Li Yang <[email protected]>
@@ -3794,10 +3861,13 @@ F:      drivers/tty/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
 M:     Timur Tabi <[email protected]>
+M:     Nicolin Chen <[email protected]>
+M:     Xiubo Li <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 L:     [email protected]
 S:     Maintained
 F:     sound/soc/fsl/fsl*
+F:     sound/soc/fsl/imx*
 F:     sound/soc/fsl/mpc8610_hpcd.c
 
 FREEVXFS FILESYSTEM
@@ -3976,6 +4046,12 @@ F:       Documentation/isdn/README.gigaset
 F:     drivers/isdn/gigaset/
 F:     include/uapi/linux/gigaset_dev.h
 
+GO7007 MPEG CODEC
+M:     Hans Verkuil <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/media/usb/go7007/
+
 GPIO SUBSYSTEM
 M:     Linus Walleij <[email protected]>
 M:     Alexandre Courbot <[email protected]>
@@ -3984,7 +4060,8 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
 F:     Documentation/gpio/
 F:     drivers/gpio/
-F:     include/linux/gpio*
+F:     include/linux/gpio/
+F:     include/linux/gpio.h
 F:     include/asm-generic/gpio.h
 
 GRE DEMULTIPLEXER DRIVER
@@ -4174,7 +4251,7 @@ M:        Ferenc Bakonyi <[email protected]>
 L:     [email protected]
 W:     http://drama.obuda.kando.hu/~fero/cgi-bin/hgafb.shtml
 S:     Maintained
-F:     drivers/video/hgafb.c
+F:     drivers/video/fbdev/hgafb.c
 
 HIBERNATION (aka Software Suspend, aka swsusp)
 M:     "Rafael J. Wysocki" <[email protected]>
@@ -4204,7 +4281,7 @@ L:        [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
 S:     Maintained
 F:     Documentation/timers/
-F:     kernel/hrtimer.c
+F:     kernel/time/hrtimer.c
 F:     kernel/time/clockevents.c
 F:     kernel/time/tick*.*
 F:     kernel/time/timer_*.c
@@ -4316,7 +4393,7 @@ F:        drivers/hv/
 F:     drivers/input/serio/hyperv-keyboard.c
 F:     drivers/net/hyperv/
 F:     drivers/scsi/storvsc_drv.c
-F:     drivers/video/hyperv_fb.c
+F:     drivers/video/fbdev/hyperv_fb.c
 F:     include/linux/hyperv.h
 F:     tools/hv/
 
@@ -4390,6 +4467,13 @@ F:       include/linux/i2c-*.h
 F:     include/uapi/linux/i2c.h
 F:     include/uapi/linux/i2c-*.h
 
+I2C ACPI SUPPORT
+M:     Mika Westerberg <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Maintained
+F:     drivers/i2c/i2c-acpi.c
+
 I2C-TAOS-EVM DRIVER
 M:     Jean Delvare <[email protected]>
 L:     [email protected]
@@ -4460,10 +4544,7 @@ S:       Supported
 F:     drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM ServeRAID RAID DRIVER
-P:     Jack Hammer
-M:     Dave Jeffery <[email protected]>
-W:     http://www.developer.ibm.com/welcome/netfinity/serveraid.html
-S:     Supported
+S:     Orphan
 F:     drivers/scsi/ips.*
 
 ICH LPC AND GPIO DRIVER
@@ -4575,7 +4656,7 @@ F:        security/integrity/ima/
 IMS TWINTURBO FRAMEBUFFER DRIVER
 L:     [email protected]
 S:     Orphan
-F:     drivers/video/imsttfb.c
+F:     drivers/video/fbdev/imsttfb.c
 
 INFINIBAND SUBSYSTEM
 M:     Roland Dreier <[email protected]>
@@ -4642,13 +4723,13 @@ M:      Maik Broemme <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     Documentation/fb/intelfb.txt
-F:     drivers/video/intelfb/
+F:     drivers/video/fbdev/intelfb/
 
 INTEL 810/815 FRAMEBUFFER DRIVER
 M:     Antonino Daplas <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/i810/
+F:     drivers/video/fbdev/i810/
 
 INTEL MENLOW THERMAL DRIVER
 M:     Sujith Thomas <[email protected]>
@@ -4660,8 +4741,8 @@ F:        drivers/platform/x86/intel_menlow.c
 INTEL IA32 MICROCODE UPDATE SUPPORT
 M:     Tigran Aivazian <[email protected]>
 S:     Maintained
-F:     arch/x86/kernel/microcode_core.c
-F:     arch/x86/kernel/microcode_intel.c
+F:     arch/x86/kernel/cpu/microcode/core*
+F:     arch/x86/kernel/cpu/microcode/intel*
 
 INTEL I/OAT DMA DRIVER
 M:     Dan Williams <[email protected]>
@@ -5066,13 +5147,6 @@ S:       Maintained
 F:     Documentation/hwmon/k8temp
 F:     drivers/hwmon/k8temp.c
 
-KTAP
-M:     Jovi Zhangwei <[email protected]>
-W:     http://www.ktap.org
-L:     [email protected]
-S:     Maintained
-F:     drivers/staging/ktap/
-
 KCONFIG
 M:     "Yann E. MORIN" <[email protected]>
 L:     [email protected]
@@ -5127,7 +5201,6 @@ L:        [email protected]
 W:     http://nfs.sourceforge.net/
 S:     Supported
 F:     fs/nfsd/
-F:     include/linux/nfsd/
 F:     include/uapi/linux/nfsd/
 F:     fs/lockd/
 F:     fs/nfs_common/
@@ -5382,6 +5455,7 @@ F:        arch/powerpc/boot/rs6000.h
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:     Benjamin Herrenschmidt <[email protected]>
 M:     Paul Mackerras <[email protected]>
+M:     Michael Ellerman <[email protected]>
 W:     http://www.penguinppc.org/
 L:     [email protected]
 Q:     http://patchwork.ozlabs.org/project/linuxppc-dev/list/
@@ -5423,16 +5497,17 @@ F:      arch/powerpc/*/*/*virtex*
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 M:     Vitaly Bordug <[email protected]>
-M:     Marcelo Tosatti <[email protected]>
 W:     http://www.penguinppc.org/
 L:     [email protected]
 S:     Maintained
 F:     arch/powerpc/platforms/8xx/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
+M:     Scott Wood <[email protected]>
 M:     Kumar Gala <[email protected]>
 W:     http://www.penguinppc.org/
 L:     [email protected]
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git
 S:     Maintained
 F:     arch/powerpc/platforms/83xx/
 F:     arch/powerpc/platforms/85xx/
@@ -5655,16 +5730,6 @@ F:       Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
 
-MAC80211 PID RATE CONTROL
-M:     Stefano Brivio <[email protected]>
-M:     Mattias Nissler <[email protected]>
-L:     [email protected]
-W:     http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
-S:     Maintained
-F:     net/mac80211/rc80211_pid*
-
 MACVLAN DRIVER
 M:     Patrick McHardy <[email protected]>
 L:     [email protected]
@@ -5709,7 +5774,8 @@ S:        Maintained
 F:     drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
-M:     Bing Zhao <[email protected]>
+M:     Amitkumar Karwar <[email protected]>
+M:     Avinash Patil <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/net/wireless/mwifiex/
@@ -5728,7 +5794,7 @@ F:        drivers/mmc/host/mvsdio.*
 MATROX FRAMEBUFFER DRIVER
 L:     [email protected]
 S:     Orphan
-F:     drivers/video/matrox/matroxfb_*
+F:     drivers/video/fbdev/matrox/matroxfb_*
 F:     include/uapi/linux/matroxfb.h
 
 MAX16065 HARDWARE MONITOR DRIVER
@@ -5855,7 +5921,6 @@ F:        drivers/clocksource/metag_generic.c
 F:     drivers/irqchip/irq-metag.c
 F:     drivers/irqchip/irq-metag-ext.c
 F:     drivers/tty/metag_da.c
-F:     fs/imgdafs/
 
 MICROBLAZE ARCHITECTURE
 M:     Michal Simek <[email protected]>
@@ -5935,6 +6000,12 @@ T:       git git://linuxtv.org/media_tree.git
 S:     Maintained
 F:     drivers/media/radio/radio-mr800.c
 
+MRF24J40 IEEE 802.15.4 RADIO DRIVER
+M:     Alan Ott <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/net/ieee802154/mrf24j40.c
+
 MSI LAPTOP SUPPORT
 M:     "Lee, Chun-Yi" <[email protected]>
 L:     [email protected]
@@ -5955,9 +6026,9 @@ 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/staging/media/msi3101/msi001*
+F:     drivers/media/tuners/msi001*
 
-MSI3101 MEDIA DRIVER
+MSI2500 MEDIA DRIVER
 M:     Antti Palosaari <[email protected]>
 L:     [email protected]
 W:     http://linuxtv.org/
@@ -5965,7 +6036,7 @@ 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/staging/media/msi3101/sdr-msi3101*
+F:     drivers/media/usb/msi2500/
 
 MT9M032 APTINA SENSOR DRIVER
 M:     Laurent Pinchart <[email protected]>
@@ -6002,8 +6073,7 @@ F:        include/media/mt9v032.h
 MULTIFUNCTION DEVICES (MFD)
 M:     Samuel Ortiz <[email protected]>
 M:     Lee Jones <[email protected]>
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next.git
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-fixes.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 S:     Supported
 F:     drivers/mfd/
 F:     include/linux/mfd/
@@ -6370,8 +6440,8 @@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
 M:     Antonino Daplas <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/riva/
-F:     drivers/video/nvidia/
+F:     drivers/video/fbdev/riva/
+F:     drivers/video/fbdev/nvidia/
 
 NVM EXPRESS DRIVER
 M:     Matthew Wilcox <[email protected]>
@@ -6441,14 +6511,14 @@ M:      Tomi Valkeinen <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/omap/
+F:     drivers/video/fbdev/omap/
 
 OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 M:     Tomi Valkeinen <[email protected]>
 L:     [email protected]
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/omap2/
+F:     drivers/video/fbdev/omap2/
 F:     Documentation/arm/OMAP/DSS
 
 OMAP HARDWARE SPINLOCK SUPPORT
@@ -6489,11 +6559,12 @@ L:      [email protected]
 S:     Maintained
 F:     arch/arm/mach-omap2/omap_hwmod_44xx_data.c
 
-OMAP IMAGE SIGNAL PROCESSOR (ISP)
+OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
 M:     Laurent Pinchart <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/media/platform/omap3isp/
+F:     drivers/staging/media/omap4iss/
 
 OMAP USB SUPPORT
 M:     Felipe Balbi <[email protected]>
@@ -6739,7 +6810,7 @@ F:        drivers/char/agp/parisc-agp.c
 F:     drivers/input/serio/gscps2.c
 F:     drivers/parport/parport_gsc.*
 F:     drivers/tty/serial/8250/8250_gsc.c
-F:     drivers/video/sti*
+F:     drivers/video/fbdev/sti*
 F:     drivers/video/console/sti*
 F:     drivers/video/logo/logo_parisc*
 
@@ -6821,6 +6892,14 @@ S:       Supported
 F:     Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 F:     drivers/pci/host/pci-tegra.c
 
+PCI DRIVER FOR TI DRA7XX
+M:     Kishon Vijay Abraham I <[email protected]>
+L:     [email protected]
+L:     [email protected]
+S:     Supported
+F:     Documentation/devicetree/bindings/pci/ti-pci.txt
+F:     drivers/pci/host/pci-dra7xx.c
+
 PCI DRIVER FOR RENESAS R-CAR
 M:     Simon Horman <[email protected]>
 L:     [email protected]
@@ -6851,6 +6930,12 @@ S:       Maintained
 F:     Documentation/devicetree/bindings/pci/host-generic-pci.txt
 F:     drivers/pci/host/pci-host-generic.c
 
+PCIE DRIVER FOR ST SPEAR13XX
+M:     Mohit Kumar <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/pci/host/*spear*
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     [email protected]
@@ -6940,9 +7025,9 @@ M:        Jamie Iles <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 T:     git git://github.com/jamieiles/linux-2.6-ji.git
 S:     Supported
+F:     arch/arm/boot/dts/picoxcell*
 F:     arch/arm/mach-picoxcell/
-F:     drivers/*/picoxcell*
-F:     drivers/*/*/picoxcell*
+F:     drivers/crypto/picoxcell*
 
 PIN CONTROL SUBSYSTEM
 M:     Linus Walleij <[email protected]>
@@ -6968,9 +7053,7 @@ M:        Thomas Abraham <[email protected]>
 L:     [email protected] (moderated for non-subscribers)
 L:     [email protected] (moderated for non-subscribers)
 S:     Maintained
-F:     drivers/pinctrl/pinctrl-exynos.*
-F:     drivers/pinctrl/pinctrl-s3c*
-F:     drivers/pinctrl/pinctrl-samsung.*
+F:     drivers/pinctrl/samsung/
 
 PIN CONTROLLER - ST SPEAR
 M:     Viresh Kumar <[email protected]>
@@ -6994,7 +7077,7 @@ S:        Maintained
 T:     git git://github.com/gxt/linux.git
 F:     drivers/input/serio/i8042-unicore32io.h
 F:     drivers/i2c/busses/i2c-puv3.c
-F:     drivers/video/fb-puv3.c
+F:     drivers/video/fbdev/fb-puv3.c
 F:     drivers/rtc/rtc-puv3.c
 
 PMBUS HARDWARE MONITORING DRIVERS
@@ -7018,6 +7101,7 @@ F:        drivers/scsi/pmcraid.*
 PMC SIERRA PM8001 DRIVER
 M:     [email protected]
 M:     [email protected]
+L:     [email protected]
 L:     [email protected]
 S:     Supported
 F:     drivers/scsi/pm8001/
@@ -7026,14 +7110,16 @@ POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <[email protected]>
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
-S:     Supported
+S:     Maintained
 F:     fs/timerfd.c
 F:     include/linux/timer*
-F:     kernel/*timer*
+F:     kernel/time/*timer*
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
+M:     Sebastian Reichel <[email protected]>
 M:     Dmitry Eremin-Solenikov <[email protected]>
 M:     David Woodhouse <[email protected]>
+L:     [email protected]
 T:     git git://git.infradead.org/battery-2.6.git
 S:     Maintained
 F:     include/linux/power_supply.h
@@ -7165,7 +7251,7 @@ F:        drivers/ptp/*
 F:     include/linux/ptp_cl*
 
 PTRACE SUPPORT
-M:     Roland McGrath <roland@redhat.com>
+M:     Roland McGrath <roland@hack.frob.com>
 M:     Oleg Nesterov <[email protected]>
 S:     Maintained
 F:     include/asm-generic/syscall.h
@@ -7215,7 +7301,7 @@ S:        Maintained
 F:     arch/arm/mach-pxa/
 F:     drivers/pcmcia/pxa2xx*
 F:     drivers/spi/spi-pxa2xx*
-F:     drivers/usb/gadget/pxa2*
+F:     drivers/usb/gadget/udc/pxa2*
 F:     include/sound/pxa2xx-lib.h
 F:     sound/arm/pxa*
 F:     sound/soc/pxa/
@@ -7224,7 +7310,7 @@ PXA3xx NAND FLASH DRIVER
 M:     Ezequiel Garcia <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/mtd/nand/pxa3xx-nand.c
+F:     drivers/mtd/nand/pxa3xx_nand.c
 
 MMP SUPPORT
 M:     Eric Miao <[email protected]>
@@ -7243,6 +7329,12 @@ M:       Robert Jarzmik <[email protected]>
 L:     [email protected]
 S:     Maintained
 
+QAT DRIVER
+M:      Tadeusz Struk <[email protected]>
+L:      [email protected]
+S:      Supported
+F:      drivers/crypto/qat/
+
 QIB DRIVER
 M:     Mike Marciniszyn <[email protected]>
 L:     [email protected]
@@ -7366,7 +7458,7 @@ RADEON FRAMEBUFFER DISPLAY DRIVER
 M:     Benjamin Herrenschmidt <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/aty/radeon*
+F:     drivers/video/fbdev/aty/radeon*
 F:     include/uapi/linux/radeonfb.h
 
 RADIOSHARK RADIO DRIVER
@@ -7388,7 +7480,7 @@ RAGE128 FRAMEBUFFER DISPLAY DRIVER
 M:     Paul Mackerras <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/aty/aty128fb.c
+F:     drivers/video/fbdev/aty/aty128fb.c
 
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:     rt2x00 project
@@ -7430,10 +7522,14 @@ L:      [email protected]
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:     Documentation/RCU/torture.txt
-F:     kernel/rcu/torture.c
+F:     kernel/rcu/rcutorture.c
 
 RCUTORTURE TEST FRAMEWORK
 M:     "Paul E. McKenney" <[email protected]>
+M:     Josh Triplett <[email protected]>
+R:     Steven Rostedt <[email protected]>
+R:     Mathieu Desnoyers <[email protected]>
+R:     Lai Jiangshan <[email protected]>
 L:     [email protected]
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@ -7456,8 +7552,11 @@ S:       Supported
 F:     net/rds/
 
 READ-COPY UPDATE (RCU)
-M:     Dipankar Sarma <[email protected]>
 M:     "Paul E. McKenney" <[email protected]>
+M:     Josh Triplett <[email protected]>
+R:     Steven Rostedt <[email protected]>
+R:     Mathieu Desnoyers <[email protected]>
+R:     Lai Jiangshan <[email protected]>
 L:     [email protected]
 W:     http://www.rdrop.com/users/paulmck/RCU/
 S:     Supported
@@ -7467,7 +7566,7 @@ X:        Documentation/RCU/torture.txt
 F:     include/linux/rcu*
 X:     include/linux/srcu.h
 F:     kernel/rcu/
-X:     kernel/rcu/torture.c
+X:     kernel/torture.c
 
 REAL TIME CLOCK (RTC) SUBSYSTEM
 M:     Alessandro Zummo <[email protected]>
@@ -7595,7 +7694,7 @@ 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/staging/media/rtl2832u_sdr/rtl2832_sdr*
+F:     drivers/media/dvb-frontends/rtl2832_sdr*
 
 RTL8180 WIRELESS DRIVER
 M:     "John W. Linville" <[email protected]>
@@ -7629,7 +7728,7 @@ S3 SAVAGE FRAMEBUFFER DRIVER
 M:     Antonino Daplas <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/savage/
+F:     drivers/video/fbdev/savage/
 
 S390
 M:     Martin Schwidefsky <[email protected]>
@@ -7752,7 +7851,7 @@ SAMSUNG FRAMEBUFFER DRIVER
 M:     Jingoo Han <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/s3c-fb.c
+F:     drivers/video/fbdev/s3c-fb.c
 
 SAMSUNG MULTIFUNCTION DEVICE DRIVERS
 M:     Sangbeom Kim <[email protected]>
@@ -7829,6 +7928,11 @@ S:       Maintained
 F:     include/linux/mmc/dw_mmc.h
 F:     drivers/mmc/host/dw_mmc*
 
+THUNDERBOLT DRIVER
+M:     Andreas Noever <[email protected]>
+S:     Maintained
+F:     drivers/thunderbolt/
+
 TIMEKEEPING, CLOCKSOURCE CORE, NTP
 M:     John Stultz <[email protected]>
 M:     Thomas Gleixner <[email protected]>
@@ -7964,6 +8068,16 @@ S:       Maintained
 F:     drivers/mmc/host/sdhci.*
 F:     drivers/mmc/host/sdhci-pltfm.[ch]
 
+SECURE COMPUTING
+M:     Kees Cook <[email protected]>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp
+S:     Supported
+F:     kernel/seccomp.c
+F:     include/uapi/linux/seccomp.h
+F:     include/linux/seccomp.h
+K:     \bsecure_computing
+K:     \bTIF_SECCOMP\b
+
 SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)
 M:     Anton Vorontsov <[email protected]>
 L:     [email protected]
@@ -8234,7 +8348,7 @@ M:        Thomas Winischhofer <[email protected]>
 W:     http://www.winischhofer.net/linuxsisvga.shtml
 S:     Maintained
 F:     Documentation/fb/sisfb.txt
-F:     drivers/video/sis/
+F:     drivers/video/fbdev/sis/
 F:     include/video/sisfb.h
 
 SIS USB2VGA DRIVER
@@ -8257,6 +8371,9 @@ F:        mm/sl?b*
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:     Lai Jiangshan <[email protected]>
 M:     "Paul E. McKenney" <[email protected]>
+M:     Josh Triplett <[email protected]>
+R:     Steven Rostedt <[email protected]>
+R:     Mathieu Desnoyers <[email protected]>
 L:     [email protected]
 W:     http://www.rdrop.com/users/paulmck/RCU/
 S:     Supported
@@ -8340,7 +8457,7 @@ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 M:     Steve Glendinning <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/video/smscufx.c
+F:     drivers/video/fbdev/smscufx.c
 
 SOC-CAMERA V4L2 SUBSYSTEM
 M:     Guennadi Liakhovetski <[email protected]>
@@ -8356,6 +8473,12 @@ M:       Chris Boot <[email protected]>
 S:     Maintained
 F:     drivers/leds/leds-net48xx.c
 
+SOFTLOGIC 6x10 MPEG CODEC
+M:     Ismael Luceno <[email protected]>
+L:     [email protected]
+S:     Supported
+F:     drivers/media/pci/solo6x10/
+
 SOFTWARE RAID (Multiple Disks) SUPPORT
 M:     Neil Brown <[email protected]>
 L:     [email protected]
@@ -8546,37 +8669,12 @@ L:      [email protected]
 S:     Supported
 F:     drivers/staging/
 
-STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
-M:     Henk de Groot <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/wlags49_h2/
-F:     drivers/staging/wlags49_h25/
-
-STAGING - ASUS OLED
-M:     Jakub Schmidtke <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/asus_oled/
-
 STAGING - COMEDI
 M:     Ian Abbott <[email protected]>
 M:     H Hartley Sweeten <[email protected]>
 S:     Odd Fixes
 F:     drivers/staging/comedi/
 
-STAGING - CRYSTAL HD VIDEO DECODER
-M:     Naren Sankar <[email protected]>
-M:     Jarod Wilson <[email protected]>
-M:     Scott Davilla <[email protected]>
-M:     Manu Abraham <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/crystalhd/
-
-STAGING - ECHO CANCELLER
-M:     Steve Underwood <[email protected]>
-M:     David Rowe <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/echo/
-
 STAGING - ET131X NETWORK DRIVER
 M:     Mark Einon <[email protected]>
 S:     Odd Fixes
@@ -8587,16 +8685,6 @@ M:       Marek Belisko <[email protected]>
 S:     Odd Fixes
 F:     drivers/staging/ft1000/
 
-STAGING - FRONTIER TRANZPORT AND ALPHATRACK
-M:     David Täht <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/frontier/
-
-STAGING - GO7007 MPEG CODEC
-M:     Hans Verkuil <[email protected]>
-S:     Maintained
-F:     drivers/staging/media/go7007/
-
 STAGING - INDUSTRIAL IO
 M:     Jonathan Cameron <[email protected]>
 L:     [email protected]
@@ -8648,52 +8736,27 @@ L:      [email protected]
 S:     Maintained
 F:     drivers/staging/rtl8723au/
 
-STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
-M:     Teddy Wang <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/sm7xxfb/
-
 STAGING - SLICOSS
 M:     Lior Dotan <[email protected]>
 M:     Christopher Harrer <[email protected]>
 S:     Odd Fixes
 F:     drivers/staging/slicoss/
 
-STAGING - SOFTLOGIC 6x10 MPEG CODEC
-M:     Ismael Luceno <[email protected]>
-S:     Supported
-F:     drivers/staging/media/solo6x10/
-
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:     William Hubbs <[email protected]>
 M:     Chris Brannon <[email protected]>
 M:     Kirk Reiser <[email protected]>
 M:     Samuel Thibault <[email protected]>
-L:     speakup@braille.uwo.ca
+L:     speakup@linux-speakup.org
 W:     http://www.linux-speakup.org/
 S:     Odd Fixes
 F:     drivers/staging/speakup/
 
-STAGING - TI DSP BRIDGE DRIVERS
-M:     Omar Ramirez Luna <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/tidspbridge/
-
-STAGING - USB ENE SM/MS CARD READER DRIVER
-M:     Al Cho <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/keucr/
-
 STAGING - VIA VT665X DRIVERS
 M:     Forest Bond <[email protected]>
 S:     Odd Fixes
 F:     drivers/staging/vt665?/
 
-STAGING - WINBOND IS89C35 WLAN USB DRIVER
-M:     Pavel Machek <[email protected]>
-S:     Odd Fixes
-F:     drivers/staging/winbond/
-
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
 M:     Arnaud Patard <[email protected]>
 S:     Odd Fixes
@@ -9051,6 +9114,13 @@ L:       [email protected]
 S:     Supported
 F:     drivers/thermal/ti-soc-thermal/
 
+TI CLOCK DRIVER
+M:     Tero Kristo <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/clk/ti/
+F:     include/linux/clk/ti.h
+
 TI FLASH MEDIA INTERFACE DRIVER
 M:     Alex Dubov <[email protected]>
 S:     Maintained
@@ -9538,15 +9608,6 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/net/usb/smsc95xx.*
 
-USB SN9C1xx DRIVER
-M:     Luca Risolia <[email protected]>
-L:     [email protected]
-L:     [email protected]
-T:     git git://linuxtv.org/media_tree.git
-W:     http://www.linux-projects.org
-S:     Maintained
-F:     drivers/staging/media/sn9c102/
-
 USB SUBSYSTEM
 M:     Greg Kroah-Hartman <[email protected]>
 L:     [email protected]
@@ -9594,8 +9655,8 @@ USB WEBCAM GADGET
 M:     Laurent Pinchart <[email protected]>
 L:     [email protected]
 S:     Maintained
-F:     drivers/usb/gadget/*uvc*.c
-F:     drivers/usb/gadget/webcam.c
+F:     drivers/usb/gadget/function/*uvc*.c
+F:     drivers/usb/gadget/legacy/webcam.c
 
 USB WIRELESS RNDIS DRIVER (rndis_wlan)
 M:     Jussi Kivilinna <[email protected]>
@@ -9660,7 +9721,7 @@ L:        [email protected]
 W:     http://dev.gentoo.org/~spock/projects/uvesafb/
 S:     Maintained
 F:     Documentation/fb/uvesafb.txt
-F:     drivers/video/uvesafb.*
+F:     drivers/video/fbdev/uvesafb.*
 
 VFAT/FAT/MSDOS FILESYSTEM
 M:     OGAWA Hirofumi <[email protected]>
@@ -9733,7 +9794,7 @@ S:        Maintained
 F:     include/linux/via-core.h
 F:     include/linux/via-gpio.h
 F:     include/linux/via_i2c.h
-F:     drivers/video/via/
+F:     drivers/video/fbdev/via/
 
 VIA VELOCITY NETWORK DRIVER
 M:     Francois Romieu <[email protected]>
@@ -9866,6 +9927,13 @@ M:       Pierre Ossman <[email protected]>
 S:     Maintained
 F:     drivers/mmc/host/wbsd.*
 
+WACOM PROTOCOL 4 SERIAL TABLETS
+M:     Julian Squires <[email protected]>
+M:     Hans de Goede <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     drivers/input/tablet/wacom_serial4.c
+
 WATCHDOG DEVICE DRIVERS
 M:     Wim Van Sebroeck <[email protected]>
 L:     [email protected]
@@ -9991,7 +10059,7 @@ F:       arch/x86/
 X86 PLATFORM DRIVERS
 M:     Matthew Garrett <[email protected]>
 L:     [email protected]
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86.git
+T:     git git://cavan.codon.org.uk/platform-drivers-x86.git
 S:     Maintained
 F:     drivers/platform/x86/
 
@@ -10053,6 +10121,13 @@ S:     Supported
 F:     arch/x86/pci/*xen*
 F:     drivers/pci/*xen*
 
+XEN BLOCK SUBSYSTEM
+M:     Konrad Rzeszutek Wilk <[email protected]>
+L:     [email protected] (moderated for non-subscribers)
+S:     Supported
+F:     drivers/block/xen-blkback/*
+F:     drivers/block/xen*
+
 XEN SWIOTLB SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <[email protected]>
 L:     [email protected] (moderated for non-subscribers)