projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'v3.17-rockchip-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index e065c38..c2ecffb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -597,7 +597,7 @@ AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 M:     Thomas Dahlmann <dahlmann.thomas@arcor.de>
 L:     linux-geode@lists.infradead.org (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 <dilinger@queued.net>
@@ -606,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)
@@ -621,7 +621,7 @@ AMD MICROCODE UPDATE SUPPORT
 M:     Andreas Herrmann <herrmann.der.user@googlemail.com>
 L:     amd64-microcode@amd64.org
 S:     Maintained
-F:     arch/x86/kernel/microcode_amd.c
+F:     arch/x86/kernel/cpu/microcode/amd*
 
 AMD XGBE DRIVER
 M:     Tom Lendacky <thomas.lendacky@amd.com>
@@ -719,6 +719,14 @@ S: Maintained
 F:     drivers/net/appletalk/
 F:     net/appletalk/
 
+APPLIED MICRO (APM) X-GENE SOC ETHERNET DRIVER
+M:     Iyappan Subramanian <isubramanian@apm.com>
+M:     Keyur Chudgar <kchudgar@apm.com>
+M:     Ravi Patel <rapatel@apm.com>
+S:     Supported
+F:     drivers/net/ethernet/apm/xgene/
+F:     Documentation/devicetree/bindings/net/apm-xgene-enet.txt
+
 APTINA CAMERA SENSOR PLL
 M:     Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -735,8 +743,8 @@ F:  drivers/ata/pata_arasan_cf.c
 ARC FRAMEBUFFER DRIVER
 M:     Jaya Kumar <jayalk@intworks.biz>
 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 <spyro@f2s.com>
@@ -775,7 +783,7 @@ F:  sound/arm/aaci.*
 ARM PRIMECELL CLCD PL110 DRIVER
 M:     Russell King <linux@arm.linux.org.uk>
 S:     Maintained
-F:     drivers/video/amba-clcd.*
+F:     drivers/video/fbdev/amba-clcd.*
 
 ARM PRIMECELL KMI PL050 DRIVER
 M:     Russell King <linux@arm.linux.org.uk>
@@ -911,7 +919,7 @@ L:  linux-arm-kernel@lists.infradead.org (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
@@ -1164,6 +1172,7 @@ M:        Linus Walleij <linus.walleij@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (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
 
@@ -1179,14 +1188,13 @@ M:      Daniel Walker <dwalker@fifo99.com>
 M:     Bryan Huntsman <bryanh@codeaurora.org>
 L:     linux-arm-msm@vger.kernel.org
 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
 
@@ -1269,6 +1277,7 @@ F:        drivers/scsi/arm/
 ARM/Rockchip SoC support
 M:     Heiko Stuebner <heiko@sntech.de>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-rockchip@lists.infradead.org
 S:     Maintained
 F:     arch/arm/mach-rockchip/
 F:     drivers/*/*rockchip*
@@ -1414,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 <linus.walleij@linaro.org>
@@ -1443,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
@@ -1483,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 <marek.vasut@gmail.com>
@@ -1675,7 +1685,7 @@ ATMEL LCDFB DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     linux-fbdev@vger.kernel.org
 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
@@ -1699,7 +1709,7 @@ ATMEL USBA UDC DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     linux-arm-kernel@lists.infradead.org (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 <simon@thekelleys.org.uk>
@@ -1991,7 +2001,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
@@ -2341,12 +2351,6 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/cirrus/ep93xx_eth.c
 
-CIRRUS LOGIC EP93XX OHCI USB HOST DRIVER
-M:     Lennert Buytenhek <kernel@wantstofly.org>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-F:     drivers/usb/host/ohci-ep93xx.c
-
 CIRRUS LOGIC AUDIO CODEC DRIVERS
 M:     Brian Austin <brian.austin@cirrus.com>
 M:     Paul Handrigan <Paul.Handrigan@cirrus.com>
@@ -2431,7 +2435,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
@@ -2708,7 +2712,7 @@ M:        Russell King <linux@arm.linux.org.uk>
 L:     linux-arm-kernel@lists.infradead.org (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/
@@ -2946,7 +2950,7 @@ M:        Bernie Thompson <bernie@plugable.com>
 L:     linux-fbdev@vger.kernel.org
 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
 
@@ -2966,7 +2970,9 @@ L:        linux-media@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
 L:     linaro-mm-sig@lists.linaro.org
 F:     drivers/dma-buf/
-F:     include/linux/dma-buf* include/linux/reservation.h include/linux/*fence.h
+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
 
@@ -3061,7 +3067,6 @@ L:        dri-devel@lists.freedesktop.org
 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
@@ -3255,26 +3260,12 @@ T:      git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/tuners/e4000*
 
-EATA-DMA SCSI DRIVER
-M:     Michael Neuffer <mike@i-Connect.Net>
-L:     linux-eata@i-connect.net
-L:     linux-scsi@vger.kernel.org
-S:     Maintained
-F:     drivers/scsi/eata*
-
 EATA ISA/EISA/PCI SCSI DRIVER
 M:     Dario Ballabio <ballabio_dario@emc.com>
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/eata.c
 
-EATA-PIO SCSI DRIVER
-M:     Michael Neuffer <mike@i-Connect.Net>
-L:     linux-eata@i-connect.net
-L:     linux-scsi@vger.kernel.org
-S:     Maintained
-F:     drivers/scsi/eata_pio.*
-
 EC100 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -3449,7 +3440,7 @@ M:        Matt Fleming <matt.fleming@intel.com>
 L:     linux-efi@vger.kernel.org
 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
@@ -3470,7 +3461,7 @@ EFIFB FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 M:     Peter Jones <pjones@redhat.com>
 S:     Maintained
-F:     drivers/video/efifb.c
+F:     drivers/video/fbdev/efifb.c
 
 EFS FILESYSTEM
 W:     http://aeschi.ch.eu.org/efs/
@@ -3535,7 +3526,7 @@ EPSON S1D13XXX FRAMEBUFFER DRIVER
 M:     Kristoffer Ericson <kristoffer.ericson@gmail.com>
 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
@@ -3613,7 +3604,7 @@ M:        Donghwa Lee <dh09.lee@samsung.com>
 M:     Kyungmin Park <kyungmin.park@samsung.com>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/exynos/exynos_mipi*
+F:     drivers/video/fbdev/exynos/exynos_mipi*
 F:     include/video/exynos_mipi*
 
 F71805F HARDWARE MONITORING DRIVER
@@ -3792,7 +3783,7 @@ FREESCALE DIU FRAMEBUFFER DRIVER
 M:     Timur Tabi <timur@tabi.org>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/fsl-diu-fb.*
+F:     drivers/video/fbdev/fsl-diu-fb.*
 
 FREESCALE DMA DRIVER
 M:     Li Yang <leoli@freescale.com>
@@ -3814,7 +3805,7 @@ L:        linux-fbdev@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (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 <pantelis.antoniou@gmail.com>
@@ -3836,7 +3827,7 @@ M:        Li Yang <leoli@freescale.com>
 L:     linux-usb@vger.kernel.org
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
-F:     drivers/usb/gadget/fsl*
+F:     drivers/usb/gadget/udc/fsl*
 
 FREESCALE QUICC ENGINE UCC ETHERNET DRIVER
 M:     Li Yang <leoli@freescale.com>
@@ -4049,7 +4040,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
@@ -4239,7 +4231,7 @@ M:        Ferenc Bakonyi <fero@drama.obuda.kando.hu>
 L:     linux-nvidia@lists.surfsouth.com
 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" <rjw@rjwysocki.net>
@@ -4381,7 +4373,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/
 
@@ -4525,10 +4517,7 @@ S:       Supported
 F:     drivers/scsi/ibmvscsi/ibmvfc*
 
 IBM ServeRAID RAID DRIVER
-P:     Jack Hammer
-M:     Dave Jeffery <ipslinux@adaptec.com>
-W:     http://www.developer.ibm.com/welcome/netfinity/serveraid.html
-S:     Supported
+S:     Orphan
 F:     drivers/scsi/ips.*
 
 ICH LPC AND GPIO DRIVER
@@ -4640,7 +4629,7 @@ F:        security/integrity/ima/
 IMS TWINTURBO FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
-F:     drivers/video/imsttfb.c
+F:     drivers/video/fbdev/imsttfb.c
 
 INFINIBAND SUBSYSTEM
 M:     Roland Dreier <roland@kernel.org>
@@ -4707,13 +4696,13 @@ M:      Maik Broemme <mbroemme@plusserver.de>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
 F:     Documentation/fb/intelfb.txt
-F:     drivers/video/intelfb/
+F:     drivers/video/fbdev/intelfb/
 
 INTEL 810/815 FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/i810/
+F:     drivers/video/fbdev/i810/
 
 INTEL MENLOW THERMAL DRIVER
 M:     Sujith Thomas <sujith.thomas@intel.com>
@@ -4725,8 +4714,8 @@ F:        drivers/platform/x86/intel_menlow.c
 INTEL IA32 MICROCODE UPDATE SUPPORT
 M:     Tigran Aivazian <tigran@aivazian.fsnet.co.uk>
 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 <dan.j.williams@intel.com>
@@ -5185,7 +5174,6 @@ L:        linux-nfs@vger.kernel.org
 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/
@@ -5779,7 +5767,7 @@ F:        drivers/mmc/host/mvsdio.*
 MATROX FRAMEBUFFER DRIVER
 L:     linux-fbdev@vger.kernel.org
 S:     Orphan
-F:     drivers/video/matrox/matroxfb_*
+F:     drivers/video/fbdev/matrox/matroxfb_*
 F:     include/uapi/linux/matroxfb.h
 
 MAX16065 HARDWARE MONITOR DRIVER
@@ -5906,7 +5894,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 <monstr@monstr.eu>
@@ -6420,8 +6407,8 @@ NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
 L:     linux-fbdev@vger.kernel.org
 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 <willy@linux.intel.com>
@@ -6491,14 +6478,14 @@ M:      Tomi Valkeinen <tomi.valkeinen@ti.com>
 L:     linux-fbdev@vger.kernel.org
 L:     linux-omap@vger.kernel.org
 S:     Maintained
-F:     drivers/video/omap/
+F:     drivers/video/fbdev/omap/
 
 OMAP DISPLAY SUBSYSTEM and FRAMEBUFFER SUPPORT (DSS2)
 M:     Tomi Valkeinen <tomi.valkeinen@ti.com>
 L:     linux-omap@vger.kernel.org
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/omap2/
+F:     drivers/video/fbdev/omap2/
 F:     Documentation/arm/OMAP/DSS
 
 OMAP HARDWARE SPINLOCK SUPPORT
@@ -6790,7 +6777,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*
 
@@ -6997,9 +6984,9 @@ M:        Jamie Iles <jamie@jamieiles.com>
 L:     linux-arm-kernel@lists.infradead.org (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 <linus.walleij@linaro.org>
@@ -7025,9 +7012,7 @@ M:        Thomas Abraham <thomas.abraham@linaro.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     linux-samsung-soc@vger.kernel.org (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 <viresh.linux@gmail.com>
@@ -7051,7 +7036,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
@@ -7075,6 +7060,7 @@ F:        drivers/scsi/pmcraid.*
 PMC SIERRA PM8001 DRIVER
 M:     xjtuwjp@gmail.com
 M:     lindar_liu@usish.com
+L:     pmchba@pmcs.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/pm8001/
@@ -7224,7 +7210,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 <oleg@redhat.com>
 S:     Maintained
 F:     include/asm-generic/syscall.h
@@ -7274,7 +7260,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/
@@ -7283,7 +7269,7 @@ PXA3xx NAND FLASH DRIVER
 M:     Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
-F:     drivers/mtd/nand/pxa3xx-nand.c
+F:     drivers/mtd/nand/pxa3xx_nand.c
 
 MMP SUPPORT
 M:     Eric Miao <eric.y.miao@gmail.com>
@@ -7431,7 +7417,7 @@ RADEON FRAMEBUFFER DISPLAY DRIVER
 M:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/aty/radeon*
+F:     drivers/video/fbdev/aty/radeon*
 F:     include/uapi/linux/radeonfb.h
 
 RADIOSHARK RADIO DRIVER
@@ -7453,7 +7439,7 @@ RAGE128 FRAMEBUFFER DISPLAY DRIVER
 M:     Paul Mackerras <paulus@samba.org>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/aty/aty128fb.c
+F:     drivers/video/fbdev/aty/aty128fb.c
 
 RALINK RT2X00 WIRELESS LAN DRIVER
 P:     rt2x00 project
@@ -7701,7 +7687,7 @@ S3 SAVAGE FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/savage/
+F:     drivers/video/fbdev/savage/
 
 S390
 M:     Martin Schwidefsky <schwidefsky@de.ibm.com>
@@ -7824,7 +7810,7 @@ SAMSUNG FRAMEBUFFER DRIVER
 M:     Jingoo Han <jg1.han@samsung.com>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/s3c-fb.c
+F:     drivers/video/fbdev/s3c-fb.c
 
 SAMSUNG MULTIFUNCTION DEVICE DRIVERS
 M:     Sangbeom Kim <sbkim73@samsung.com>
@@ -8321,7 +8307,7 @@ M:        Thomas Winischhofer <thomas@winischhofer.net>
 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
@@ -8430,7 +8416,7 @@ SMSC UFX6000 and UFX7000 USB to VGA DRIVER
 M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     drivers/video/smscufx.c
+F:     drivers/video/fbdev/smscufx.c
 
 SOC-CAMERA V4L2 SUBSYSTEM
 M:     Guennadi Liakhovetski <g.liakhovetski@gmx.de>
@@ -9628,8 +9614,8 @@ USB WEBCAM GADGET
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-usb@vger.kernel.org
 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 <jussi.kivilinna@iki.fi>
@@ -9694,7 +9680,7 @@ L:        linux-fbdev@vger.kernel.org
 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 <hirofumi@mail.parknet.co.jp>
@@ -9767,7 +9753,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 <romieu@fr.zoreil.com>
@@ -9900,6 +9886,13 @@ M:       Pierre Ossman <pierre@ossman.eu>
 S:     Maintained
 F:     drivers/mmc/host/wbsd.*
 
+WACOM PROTOCOL 4 SERIAL TABLETS
+M:     Julian Squires <julian@cipht.net>
+M:     Hans de Goede <hdegoede@redhat.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/input/tablet/wacom_serial4.c
+
 WATCHDOG DEVICE DRIVERS
 M:     Wim Van Sebroeck <wim@iguana.be>
 L:     linux-watchdog@vger.kernel.org
@@ -10025,7 +10018,7 @@ F:      arch/x86/
 X86 PLATFORM DRIVERS
 M:     Matthew Garrett <matthew.garrett@nebula.com>
 L:     platform-driver-x86@vger.kernel.org
-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/
 
Unnamed repository; edit this file 'description' to name the repository.