Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...
[cascardo/linux.git] / MAINTAINERS
index 8873ca6..f107230 100644 (file)
@@ -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: linux-scsi@vger.kernel.org
 S:     Maintained
 F:     drivers/scsi/53c700*
 
+6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
+M:     Alexander Aring <alex.aring@gmail.com>
+L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
+L:     linux-bluetooth@vger.kernel.org
+S:     Maintained
+F:     net/6lowpan/
+F:     include/net/6lowpan.h
+
 6PACK NETWORK DRIVER FOR AX.25
 M:     Andreas Koensgen <ajk@comnets.uni-bremen.de>
 L:     linux-hams@vger.kernel.org
@@ -156,7 +166,6 @@ F:  drivers/net/hamradio/6pack.c
 
 8169 10/100/1000 GIGABIT ETHERNET DRIVER
 M:     Realtek linux nic maintainers <nic_swsd@realtek.com>
-M:     Francois Romieu <romieu@fr.zoreil.com>
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/ethernet/realtek/r8169.c
@@ -210,6 +219,13 @@ S: Supported
 F:     Documentation/scsi/aacraid.txt
 F:     drivers/scsi/aacraid/
 
+ABI/API
+L:     linux-api@vger.kernel.org
+F:     Documentation/ABI/
+F:     include/linux/syscalls.h
+F:     include/uapi/
+F:     kernel/sys_ni.c
+
 ABIT UGURU 1,2 HARDWARE MONITOR DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     lm-sensors@lm-sensors.org
@@ -242,8 +258,8 @@ S:  Maintained
 F:     drivers/platform/x86/acer-wmi.c
 
 ACPI
-M:     Len Brown <lenb@kernel.org>
 M:     Rafael J. Wysocki <rjw@rjwysocki.net>
+M:     Len Brown <lenb@kernel.org>
 L:     linux-acpi@vger.kernel.org
 W:     https://01.org/linux-acpi
 Q:     https://patchwork.kernel.org/project/linux-acpi/list/
@@ -355,7 +371,7 @@ F:  Documentation/hwmon/adm1025
 F:     drivers/hwmon/adm1025.c
 
 ADM1029 HARDWARE MONITOR DRIVER
-M:     Corentin Labbe <corentin.labbe@geomatys.fr>
+M:     Corentin Labbe <clabbe.montjoie@gmail.com>
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
 F:     drivers/hwmon/adm1029.c
@@ -508,6 +524,16 @@ S: Supported
 F:     fs/aio.c
 F:     include/linux/*aio*.h
 
+AIRSPY MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+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 <duncan.sands@free.fr>
 L:     linux-usb@vger.kernel.org
@@ -536,6 +562,13 @@ S: Odd Fixes
 L:     linux-alpha@vger.kernel.org
 F:     arch/alpha/
 
+ALTERA TRIPLE SPEED ETHERNET DRIVER
+M:     Vince Bridgers <vbridgers2013@gmail.com>
+L:     netdev@vger.kernel.org
+L:     nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
+S:     Maintained
+F:     drivers/net/ethernet/altera/
+
 ALTERA UART/JTAG UART SERIAL DRIVERS
 M:     Tobias Klauser <tklauser@distanz.ch>
 L:     linux-serial@vger.kernel.org
@@ -564,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>
@@ -573,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)
@@ -588,7 +621,14 @@ 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>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/amd/xgbe/
+F:     drivers/net/phy/amd-xgbe-phy.c
 
 AMS (Apple Motion Sensor) DRIVER
 M:     Michael Hanselmann <linux-kernel@hansmi.ch>
@@ -640,7 +680,7 @@ F:  sound/soc/codecs/ssm*
 F:     sound/soc/codecs/sigmadsp.*
 
 ANALOG DEVICES INC ASOC DRIVERS
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
 S:     Supported
@@ -679,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
@@ -695,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>
@@ -735,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>
@@ -801,6 +849,11 @@ F: arch/arm/boot/dts/at91*.dtsi
 F:     arch/arm/boot/dts/sama*.dts
 F:     arch/arm/boot/dts/sama*.dtsi
 
+ARM/ATMEL AT91 Clock Support
+M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+S:     Maintained
+F:     drivers/clk/at91
+
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -817,7 +870,7 @@ ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECTURE
 M:     Alexander Shiyan <shc_work@mail.ru>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Odd Fixes
-F:     arch/arm/mach-clps711x/
+N:     clps711x
 
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
 M:     Hartley Sweeten <hsweeten@visionengravers.com>
@@ -866,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
@@ -911,22 +964,16 @@ F:        arch/arm/include/asm/hardware/dec21285.h
 F:     arch/arm/mach-footbridge/
 
 ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
-M:     Shawn Guo <shawn.guo@linaro.org>
+M:     Shawn Guo <shawn.guo@freescale.com>
 M:     Sascha Hauer <kernel@pengutronix.de>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
-T:     git git://git.linaro.org/people/shawnguo/linux-2.6.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
 F:     arch/arm/mach-imx/
+F:     arch/arm/mach-mxs/
 F:     arch/arm/boot/dts/imx*
 F:     arch/arm/configs/imx*_defconfig
 
-ARM/FREESCALE MXS ARM ARCHITECTURE
-M:     Shawn Guo <shawn.guo@linaro.org>
-L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-S:     Maintained
-T:     git git://git.linaro.org/people/shawnguo/linux-2.6.git
-F:     arch/arm/mach-mxs/
-
 ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -946,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 <xuwei5@hisilicon.com>
+L:     linux-arm-kernel@lists.infradead.org (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 <kristoffer.ericson@gmail.com>
 W:     www.jlime.com
@@ -1021,9 +1076,33 @@ M:       Santosh Shilimkar <santosh.shilimkar@ti.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     arch/arm/mach-keystone/
-F:     drivers/clk/keystone/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
 
+ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
+M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/clk/keystone/
+
+ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE
+M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/clocksource/timer-keystone.c
+
+ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER
+M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/power/reset/keystone-reset.c
+
+ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS
+M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/memory/*emif*
+
 ARM/LOGICPD PXA270 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1048,14 +1127,13 @@ L:      linux-arm-kernel@lists.infradead.org (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 <jason@lakedaemon.net>
 M:     Andrew Lunn <andrew@lunn.ch>
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (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/
@@ -1089,6 +1167,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
 
@@ -1104,14 +1183,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
 
@@ -1163,6 +1241,14 @@ L:       linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.arm.linux.org.uk/
 S:     Maintained
 
+ARM/QUALCOMM SUPPORT
+M:     Kumar Gala <galak@codeaurora.org>
+M:     David Brown <davidb@codeaurora.org>
+L:     linux-arm-msm@vger.kernel.org
+S:     Maintained
+F:     arch/arm/mach-qcom/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
+
 ARM/RADISYS ENP2611 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1186,9 +1272,15 @@ 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/boot/dts/rk3*
 F:     arch/arm/mach-rockchip/
+F:     drivers/clk/rockchip/
+F:     drivers/i2c/busses/i2c-rk3x.c
 F:     drivers/*/*rockchip*
+F:     drivers/*/*/*rockchip*
+F:     sound/soc/rockchip/
 
 ARM/SAMSUNG ARM ARCHITECTURES
 M:     Ben Dooks <ben-linux@fluff.org>
@@ -1257,6 +1349,20 @@ W:       http://oss.renesas.com
 Q:     http://patchwork.kernel.org/project/linux-sh/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
 S:     Supported
+F:     arch/arm/boot/dts/emev2*
+F:     arch/arm/boot/dts/r7s*
+F:     arch/arm/boot/dts/r8a*
+F:     arch/arm/boot/dts/sh*
+F:     arch/arm/configs/ape6evm_defconfig
+F:     arch/arm/configs/armadillo800eva_defconfig
+F:     arch/arm/configs/bockw_defconfig
+F:     arch/arm/configs/genmai_defconfig
+F:     arch/arm/configs/koelsch_defconfig
+F:     arch/arm/configs/kzm9g_defconfig
+F:     arch/arm/configs/lager_defconfig
+F:     arch/arm/configs/mackerel_defconfig
+F:     arch/arm/configs/marzen_defconfig
+F:     arch/arm/configs/shmobile_defconfig
 F:     arch/arm/mach-shmobile/
 F:     drivers/sh/
 
@@ -1271,13 +1377,22 @@ S:      Maintained
 F:     drivers/clk/socfpga/
 
 ARM/STI ARCHITECTURE
-M:     Srinivas Kandagatla <srinivas.kandagatla@st.com>
-M:     Stuart Menefy <stuart.menefy@st.com>
+M:     Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
+M:     Maxime Coquelin <maxime.coquelin@st.com>
+M:     Patrice Chotard <patrice.chotard@st.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     kernel@stlinux.com
 W:     http://www.stlinux.com
 S:     Maintained
 F:     arch/arm/mach-sti/
+F:     arch/arm/boot/dts/sti*
+F:     drivers/clocksource/arm_global_timer.c
+F:     drivers/reset/sti/
+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 <kernel@wantstofly.org>
@@ -1308,13 +1423,14 @@ 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>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Supported
 F:     arch/arm/mach-u300/
+F:     drivers/clocksource/timer-u300.c
 F:     drivers/i2c/busses/i2c-stu300.c
 F:     drivers/rtc/rtc-coh901331.c
 F:     drivers/watchdog/coh901327_wdt.c
@@ -1336,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
@@ -1376,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>
@@ -1398,6 +1515,7 @@ F:        drivers/cpuidle/cpuidle-zynq.c
 N:     zynq
 N:     xilinx
 F:     drivers/clocksource/cadence_ttc_timer.c
+F:     drivers/i2c/busses/i2c-cadence.c
 F:     drivers/mmc/host/sdhci-of-arasan.c
 
 ARM SMMU DRIVER
@@ -1542,6 +1660,12 @@ M:       Nicolas Ferre <nicolas.ferre@atmel.com>
 S:     Supported
 F:     drivers/tty/serial/atmel_serial.c
 
+ATMEL Audio ALSA driver
+M:     Bo Shen <voice.shen@atmel.com>
+L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
+S:     Supported
+F:     sound/soc/atmel
+
 ATMEL DMA DRIVER
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1567,7 +1691,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
@@ -1587,17 +1711,11 @@ S:      Supported
 F:     drivers/misc/atmel_tclib.c
 F:     drivers/clocksource/tcb_clksrc.c
 
-ATMEL TSADCC DRIVER
-M:     Josh Wu <josh.wu@atmel.com>
-L:     linux-input@vger.kernel.org
-S:     Supported
-F:     drivers/input/touchscreen/atmel_tsadcc.c
-
 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>
@@ -1691,6 +1809,8 @@ F:        drivers/net/wireless/b43legacy/
 
 BACKLIGHT CLASS/SUBSYSTEM
 M:     Jingoo Han <jg1.han@samsung.com>
+M:     Bryan Wu <cooloney@gmail.com>
+M:     Lee Jones <lee.jones@linaro.org>
 S:     Maintained
 F:     drivers/video/backlight/
 F:     include/linux/backlight.h
@@ -1718,11 +1838,24 @@ W:      http://bcache.evilpiepirate.org
 S:     Maintained:
 F:     drivers/md/bcache/
 
+BECEEM BCS200/BCS220-3/BCSM250 WIMAX SUPPORT
+M: Kevin McKinney <klmckinney1@gmail.com>
+M: Matthias Beyer <mail@beyermatthias.de>
+L: devel@driverdev.osuosl.org
+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 <reksio@newterm.pl>
+L: netdev@vger.kernel.org
+S: Maintained
+F: drivers/net/ethernet/ec_bhf.c
+
 BFS FILE SYSTEM
 M:     "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk>
 S:     Maintained
@@ -1732,54 +1865,54 @@ F:      include/uapi/linux/bfs_fs.h
 
 BLACKFIN ARCHITECTURE
 M:     Steven Miao <realmz6@gmail.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 T:     git git://git.code.sf.net/p/adi-linux/code
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     arch/blackfin/
 
 BLACKFIN EMAC DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/net/ethernet/adi/
 
 BLACKFIN RTC DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/rtc/rtc-bfin.c
 
 BLACKFIN SDH DRIVER
 M:     Sonic Zhang <sonic.zhang@analog.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/mmc/host/bfin_sdh.c
 
 BLACKFIN SERIAL DRIVER
 M:     Sonic Zhang <sonic.zhang@analog.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/tty/serial/bfin_uart.c
 
 BLACKFIN WATCHDOG DRIVER
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org
 S:     Supported
 F:     drivers/watchdog/bfin_wdt.c
 
 BLACKFIN I2C TWI DRIVER
 M:     Sonic Zhang <sonic.zhang@analog.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
 S:     Supported
 F:     drivers/i2c/busses/i2c-bfin-twi.c
 
 BLACKFIN MEDIA DRIVER
 M:     Scott Jiang <scott.jiang.linux@gmail.com>
-L:     adi-buildroot-devel@lists.sourceforge.net
+L:     adi-buildroot-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://blackfin.uclinux.org/
 S:     Supported
 F:     drivers/media/platform/blackfin/
@@ -1827,8 +1960,8 @@ F:        net/bluetooth/
 F:     include/net/bluetooth/
 
 BONDING DRIVER
-M:     Jay Vosburgh <fubar@us.ibm.com>
-M:     Veaceslav Falico <vfalico@redhat.com>
+M:     Jay Vosburgh <j.vosburgh@gmail.com>
+M:     Veaceslav Falico <vfalico@gmail.com>
 M:     Andy Gospodarek <andy@greyhouse.net>
 L:     netdev@vger.kernel.org
 W:     http://sourceforge.net/projects/bonding/
@@ -1836,36 +1969,51 @@ S:      Supported
 F:     drivers/net/bonding/
 F:     include/uapi/linux/if_bonding.h
 
+BPF (Safe dynamic programs and tools)
+M:     Alexei Starovoitov <ast@kernel.org>
+L:     netdev@vger.kernel.org
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     kernel/bpf/
+
 BROADCOM B44 10/100 ETHERNET DRIVER
 M:     Gary Zambrano <zambrano@broadcom.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/b44.*
 
+BROADCOM GENET ETHERNET DRIVER
+M:     Florian Fainelli <f.fainelli@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/broadcom/genet/
+
 BROADCOM BNX2 GIGABIT ETHERNET DRIVER
-M:     Michael Chan <mchan@broadcom.com>
+M:     Sony Chacko <sony.chacko@qlogic.com>
+M:     Dept-HSGLinuxNICDev@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2.*
 F:     drivers/net/ethernet/broadcom/bnx2_*
 
 BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
-M:     Ariel Elior <ariele@broadcom.com>
+M:     Ariel Elior <ariel.elior@qlogic.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bnx2x/
 
-BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
+BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
 M:     Christian Daudt <bcm@fixthebug.org>
 M:     Matt Porter <mporter@linaro.org>
 L:     bcm-kernel-feedback-list@broadcom.com
-T:     git git://git.github.com/broadcom/bcm11351
+T:     git git://github.com/broadcom/mach-bcm
 S:     Maintained
 F:     arch/arm/mach-bcm/
 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
@@ -1873,13 +2021,29 @@ M:      Stephen Warren <swarren@wwwdotorg.org>
 L:     linux-rpi-kernel@lists.infradead.org (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/mach-bcm/board_bcm2835.c
 F:     arch/arm/boot/dts/bcm2835*
 F:     arch/arm/configs/bcm2835_defconfig
 F:     drivers/*/*bcm2835*
 
+BROADCOM BCM5301X ARM ARCHICTURE
+M:     Hauke Mehrtens <hauke@hauke-m.de>
+L:     linux-arm-kernel@lists.infradead.org
+S:     Maintained
+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 <marc.ceeeee@gmail.com>
+M:     Brian Norris <computersforpeace@gmail.com>
+L:     linux-arm-kernel@lists.infradead.org (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 <mchan@broadcom.com>
 L:     netdev@vger.kernel.org
 S:     Supported
@@ -1896,17 +2060,24 @@ S:      Supported
 F:     drivers/net/wireless/brcm80211/
 
 BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
-M:     Eddie Wai <eddie.wai@broadcom.com>
+M:     QLogic-Storage-Upstream@qlogic.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bnx2fc/
 
 BROADCOM BNX2I 1/10 GIGABIT iSCSI DRIVER
-M:     Eddie Wai <eddie.wai@broadcom.com>
+M:     QLogic-Storage-Upstream@qlogic.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bnx2i/
 
+BROADCOM KONA GPIO DRIVER
+M:     Ray Jui <rjui@broadcom.com>
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Supported
+F:     drivers/gpio/gpio-bcm-kona.c
+F:     Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+
 BROADCOM SPECIFIC AMBA DRIVER (BCMA)
 M:     Rafał Miłecki <zajec5@gmail.com>
 L:     linux-wireless@vger.kernel.org
@@ -1914,15 +2085,21 @@ S:      Maintained
 F:     drivers/bcma/
 F:     include/linux/bcma/
 
+BROADCOM SYSTEMPORT ETHERNET DRIVER
+M:     Florian Fainelli <f.fainelli@gmail.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     drivers/net/ethernet/broadcom/bcmsysport.*
+
 BROCADE BFA FC SCSI DRIVER
-M:     Anil Gurumurthy <agurumur@brocade.com>
-M:     Vijaya Mohan Guvva <vmohan@brocade.com>
+M:     Anil Gurumurthy <anil.gurumurthy@qlogic.com>
+M:     Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     drivers/scsi/bfa/
 
 BROCADE BNA 10 GIGABIT ETHERNET DRIVER
-M:     Rasesh Mody <rmody@brocade.com>
+M:     Rasesh Mody <rasesh.mody@qlogic.com>
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/brocade/bna/
@@ -2140,6 +2317,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
 S:     Supported
 F:     drivers/char/*
 F:     drivers/misc/*
+F:     include/linux/miscdevice.h
 
 CHECKPATCH
 M:     Andy Whitcroft <apw@canonical.com>
@@ -2169,9 +2347,8 @@ F:        drivers/platform/chrome/
 CISCO VIC ETHERNET NIC DRIVER
 M:     Christian Benvenuti <benve@cisco.com>
 M:     Sujith Sankar <ssujith@cisco.com>
-M:     Govindarajulu Varadarajan <govindarajulu90@gmail.com>
+M:     Govindarajulu Varadarajan <_govind@gmx.com>
 M:     Neel Patel <neepatel@cisco.com>
-M:     Nishank Trivedi <nistrive@cisco.com>
 S:     Supported
 F:     drivers/net/ethernet/cisco/enic/
 
@@ -2186,17 +2363,12 @@ 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 CS4270 SOUND DRIVER
-M:     Timur Tabi <timur@tabi.org>
+CIRRUS LOGIC AUDIO CODEC DRIVERS
+M:     Brian Austin <brian.austin@cirrus.com>
+M:     Paul Handrigan <Paul.Handrigan@cirrus.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
-S:     Odd Fixes
-F:     sound/soc/codecs/cs4270*
+S:     Maintained
+F:     sound/soc/codecs/cs*
 
 CLEANCACHE API
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
@@ -2259,7 +2431,7 @@ F:        include/uapi/linux/coda*.h
 
 COMMON CLK FRAMEWORK
 M:     Mike Turquette <mturquette@linaro.org>
-L:     linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
+L:     linux-kernel@vger.kernel.org
 T:     git git://git.linaro.org/people/mturquette/linux.git
 S:     Maintained
 F:     drivers/clk/
@@ -2275,7 +2447,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
@@ -2322,16 +2494,35 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/connector/
 
-CONTROL GROUPS (CGROUPS)
+CONTROL GROUP (CGROUP)
 M:     Tejun Heo <tj@kernel.org>
 M:     Li Zefan <lizefan@huawei.com>
-L:     containers@lists.linux-foundation.org
 L:     cgroups@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
 S:     Maintained
+F:     Documentation/cgroups/
 F:     include/linux/cgroup*
 F:     kernel/cgroup*
-F:     mm/*cgroup*
+
+CONTROL GROUP - CPUSET
+M:     Li Zefan <lizefan@huawei.com>
+L:     cgroups@vger.kernel.org
+W:     http://www.bullopensource.org/cpuset/
+W:     http://oss.sgi.com/projects/cpusets/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
+S:     Maintained
+F:     Documentation/cgroups/cpusets.txt
+F:     include/linux/cpuset.h
+F:     kernel/cpuset.c
+
+CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
+M:     Johannes Weiner <hannes@cmpxchg.org>
+M:     Michal Hocko <mhocko@suse.cz>
+L:     cgroups@vger.kernel.org
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     mm/memcontrol.c
+F:     mm/page_cgroup.c
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:     Fenghua Yu <fenghua.yu@intel.com>
@@ -2355,7 +2546,6 @@ F:        drivers/net/ethernet/ti/cpmac.c
 CPU FREQUENCY DRIVERS
 M:     Rafael J. Wysocki <rjw@rjwysocki.net>
 M:     Viresh Kumar <viresh.kumar@linaro.org>
-L:     cpufreq@vger.kernel.org
 L:     linux-pm@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
@@ -2366,7 +2556,6 @@ F:        include/linux/cpufreq.h
 CPU FREQUENCY DRIVERS - ARM BIG LITTLE
 M:     Viresh Kumar <viresh.kumar@linaro.org>
 M:     Sudeep Holla <sudeep.holla@arm.com>
-L:     cpufreq@vger.kernel.org
 L:     linux-pm@vger.kernel.org
 W:     http://www.arm.com/products/processors/technologies/biglittleprocessing.php
 S:     Maintained
@@ -2399,22 +2588,11 @@ F:      arch/x86/kernel/cpuid.c
 F:     arch/x86/kernel/msr.c
 
 CPU POWER MONITORING SUBSYSTEM
-M:     Dominik Brodowski <linux@dominikbrodowski.net>
 M:     Thomas Renninger <trenn@suse.de>
+L:     linux-pm@vger.kernel.org
 S:     Maintained
 F:     tools/power/cpupower/
 
-CPUSETS
-M:     Li Zefan <lizefan@huawei.com>
-L:     cgroups@vger.kernel.org
-W:     http://www.bullopensource.org/cpuset/
-W:     http://oss.sgi.com/projects/cpusets/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
-S:     Maintained
-F:     Documentation/cgroups/cpusets.txt
-F:     include/linux/cpuset.h
-F:     kernel/cpuset.c
-
 CRAMFS FILESYSTEM
 W:     http://sourceforge.net/projects/cramfs/
 S:     Orphan / Obsolete
@@ -2514,7 +2692,7 @@ S:        Supported
 F:     drivers/infiniband/hw/cxgb3/
 
 CXGB4 ETHERNET DRIVER (CXGB4)
-M:     Dimitris Michailidis <dm@chelsio.com>
+M:     Hariprasad S <hariprasad@chelsio.com>
 L:     netdev@vger.kernel.org
 W:     http://www.chelsio.com
 S:     Supported
@@ -2546,7 +2724,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/
@@ -2632,6 +2810,15 @@ S:       Orphan
 F:     Documentation/networking/decnet.txt
 F:     net/decnet/
 
+DECSTATION PLATFORM SUPPORT
+M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+L:     linux-mips@linux-mips.org
+W:     http://www.linux-mips.org/wiki/DECstation
+S:     Maintained
+F:     arch/mips/dec/
+F:     arch/mips/include/asm/dec/
+F:     arch/mips/include/asm/mach-dec/
+
 DEFXX FDDI NETWORK DRIVER
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
 S:     Maintained
@@ -2702,14 +2889,42 @@ F:      include/linux/device-mapper.h
 F:     include/linux/dm-*.h
 F:     include/uapi/linux/dm-*.h
 
+DIALOG SEMICONDUCTOR DRIVERS
+M:     Support Opensource <support.opensource@diasemi.com>
+W:     http://www.dialog-semiconductor.com/products
+S:     Supported
+F:     Documentation/hwmon/da90??
+F:     drivers/gpio/gpio-da90??.c
+F:     drivers/hwmon/da90??-hwmon.c
+F:     drivers/input/misc/da90??_onkey.c
+F:     drivers/input/touchscreen/da9052_tsi.c
+F:     drivers/leds/leds-da90??.c
+F:     drivers/mfd/da903x.c
+F:     drivers/mfd/da90??-*.c
+F:     drivers/power/da9052-battery.c
+F:     drivers/regulator/da903x.c
+F:     drivers/regulator/da9???-regulator.[ch]
+F:     drivers/rtc/rtc-da90??.c
+F:     drivers/video/backlight/da90??_bl.c
+F:     drivers/watchdog/da90??_wdt.c
+F:     include/linux/mfd/da903x.h
+F:     include/linux/mfd/da9052/
+F:     include/linux/mfd/da9055/
+F:     include/linux/mfd/da9063/
+F:     include/sound/da[79]*.h
+F:     sound/soc/codecs/da[79]*.[ch]
+
 DIGI NEO AND CLASSIC PCI PRODUCTS
 M:     Lidza Louina <lidza.louina@gmail.com>
+M:     Mark Hounschell <markh@compro.net>
 L:     driverdev-devel@linuxdriverproject.org
 S:     Maintained
 F:     drivers/staging/dgnc/
 
 DIGI EPCA PCI PRODUCTS
 M:     Lidza Louina <lidza.louina@gmail.com>
+M:     Mark Hounschell <markh@compro.net>
+M:     Daeseok Youn <daeseok.youn@gmail.com>
 L:     driverdev-devel@linuxdriverproject.org
 S:     Maintained
 F:     drivers/staging/dgap/
@@ -2747,7 +2962,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
 
@@ -2766,8 +2981,10 @@ S:       Maintained
 L:     linux-media@vger.kernel.org
 L:     dri-devel@lists.freedesktop.org
 L:     linaro-mm-sig@lists.linaro.org
-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
 
@@ -2794,11 +3011,13 @@ S:      Supported
 F:     drivers/acpi/dock.c
 
 DOCUMENTATION
-M:     Rob Landley <rob@landley.net>
+M:     Jiri Kosina <jkosina@suse.cz>
 L:     linux-doc@vger.kernel.org
-T:     TBD
 S:     Maintained
 F:     Documentation/
+X:     Documentation/ABI/
+X:     Documentation/devicetree/
+X:     Documentation/[a-z][a-z]_[A-Z][A-Z]/
 
 DOUBLETALK DRIVER
 M:     "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -2846,6 +3065,7 @@ L:        dri-devel@lists.freedesktop.org
 T:     git git://people.freedesktop.org/~airlied/linux
 S:     Maintained
 F:     drivers/gpu/drm/
+F:     drivers/gpu/vga/
 F:     include/drm/
 F:     include/uapi/drm/
 
@@ -2856,9 +3076,18 @@ 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
+M:     Thierry Reding <thierry.reding@gmail.com>
+L:     dri-devel@lists.freedesktop.org
+T:     git git://anongit.freedesktop.org/tegra/linux.git
+S:     Maintained
+F:     drivers/gpu/drm/drm_panel.c
+F:     drivers/gpu/drm/panel/
+F:     include/drm/drm_panel.h
+F:     Documentation/devicetree/bindings/panel/
+
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 M:     Daniel Vetter <daniel.vetter@ffwll.ch>
 M:     Jani Nikula <jani.nikula@linux.intel.com>
@@ -2896,6 +3125,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 <laurent.pinchart@ideasonboard.com>
+L:     dri-devel@lists.freedesktop.org
+L:     linux-sh@vger.kernel.org
+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 <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -3040,35 +3280,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.*
-
-EBTABLES
-M:     Bart De Schuymer <bart.de.schuymer@pandora.be>
-L:     netfilter-devel@vger.kernel.org
-W:     http://ebtables.sourceforge.net/
-S:     Maintained
-F:     include/linux/netfilter_bridge/ebt_*.h
-F:     include/uapi/linux/netfilter_bridge/ebt_*.h
-F:     net/bridge/netfilter/ebt*.c
-
 EC100 MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -3196,6 +3413,13 @@ W:       bluesmoke.sourceforge.net
 S:     Maintained
 F:     drivers/edac/i82975x_edac.c
 
+EDAC-IE31200
+M:     Jason Baron <jbaron@akamai.com>
+L:     linux-edac@vger.kernel.org
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+F:     drivers/edac/ie31200_edac.c
+
 EDAC-MPC85XX
 M:     Johannes Thumshirn <johannes.thumshirn@men.de>
 L:     linux-edac@vger.kernel.org
@@ -3236,7 +3460,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
@@ -3257,7 +3481,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/
@@ -3322,7 +3546,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
@@ -3373,7 +3597,9 @@ F:        Documentation/filesystems/ext4.txt
 F:     fs/ext4/
 
 Extended Verification Module (EVM)
-M:     Mimi Zohar <zohar@us.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+L:     linux-ima-devel@lists.sourceforge.net
+L:     linux-security-module@vger.kernel.org
 S:     Supported
 F:     security/integrity/evm/
 
@@ -3388,9 +3614,9 @@ F:        Documentation/extcon/
 
 EXYNOS DP DRIVER
 M:     Jingoo Han <jg1.han@samsung.com>
-L:     linux-fbdev@vger.kernel.org
+L:     dri-devel@lists.freedesktop.org
 S:     Maintained
-F:     drivers/video/exynos/exynos_dp*
+F:     drivers/gpu/drm/exynos/exynos_dp*
 
 EXYNOS MIPI DISPLAY DRIVERS
 M:     Inki Dae <inki.dae@samsung.com>
@@ -3398,7 +3624,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
@@ -3457,7 +3683,8 @@ F:        include/scsi/libfcoe.h
 F:     include/uapi/scsi/fc/
 
 FILE LOCKING (flock() and fcntl()/lockf())
-M:     Matthew Wilcox <matthew@wil.cx>
+M:     Jeff Layton <jlayton@poochiereds.net>
+M:     J. Bruce Fields <bfields@fieldses.org>
 L:     linux-fsdevel@vger.kernel.org
 S:     Maintained
 F:     include/linux/fcntl.h
@@ -3576,7 +3803,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>
@@ -3598,7 +3825,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>
@@ -3620,7 +3847,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>
@@ -3637,10 +3864,13 @@ F:      drivers/tty/serial/ucc_uart.c
 
 FREESCALE SOC SOUND DRIVERS
 M:     Timur Tabi <timur@tabi.org>
+M:     Nicolin Chen <nicoleotsuka@gmail.com>
+M:     Xiubo Li <Li.Xiubo@freescale.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     sound/soc/fsl/fsl*
+F:     sound/soc/fsl/imx*
 F:     sound/soc/fsl/mpc8610_hpcd.c
 
 FREEVXFS FILESYSTEM
@@ -3650,8 +3880,8 @@ S:        Maintained
 F:     fs/freevxfs/
 
 FREEZER
-M:     Pavel Machek <pavel@ucw.cz>
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:     Pavel Machek <pavel@ucw.cz>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/power/freezing-of-tasks.txt
@@ -3674,7 +3904,8 @@ F:        fs/fscache/
 F:     include/linux/fscache*.h
 
 F2FS FILE SYSTEM
-M:     Jaegeuk Kim <jaegeuk.kim@samsung.com>
+M:     Jaegeuk Kim <jaegeuk@kernel.org>
+M:     Changman Lee <cm224.lee@samsung.com>
 L:     linux-f2fs-devel@lists.sourceforge.net
 W:     http://en.wikipedia.org/wiki/F2FS
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
@@ -3792,6 +4023,11 @@ L:       kvm@vger.kernel.org
 S:     Supported
 F:     drivers/uio/uio_pci_generic.c
 
+GET_MAINTAINER SCRIPT
+M:     Joe Perches <joe@perches.com>
+S:     Maintained
+F:     scripts/get_maintainer.pl
+
 GFS2 FILE SYSTEM
 M:     Steven Whitehouse <swhiteho@redhat.com>
 L:     cluster-devel@redhat.com
@@ -3813,6 +4049,12 @@ F:       Documentation/isdn/README.gigaset
 F:     drivers/isdn/gigaset/
 F:     include/uapi/linux/gigaset_dev.h
 
+GO7007 MPEG CODEC
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-media@vger.kernel.org
+S:     Maintained
+F:     drivers/media/usb/go7007/
+
 GPIO SUBSYSTEM
 M:     Linus Walleij <linus.walleij@linaro.org>
 M:     Alexandre Courbot <gnurou@gmail.com>
@@ -3821,7 +4063,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
@@ -3916,9 +4159,8 @@ S:        Odd Fixes
 F:     drivers/media/usb/hdpvr/
 
 HWPOISON MEMORY FAILURE HANDLING
-M:     Andi Kleen <andi@firstfloor.org>
+M:     Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
 L:     linux-mm@kvack.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git hwpoison
 S:     Maintained
 F:     mm/memory-failure.c
 F:     mm/hwpoison-inject.c
@@ -4012,11 +4254,11 @@ 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:     Pavel Machek <pavel@ucw.cz>
 M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
+M:     Pavel Machek <pavel@ucw.cz>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     arch/x86/power/
@@ -4042,7 +4284,7 @@ L:        linux-kernel@vger.kernel.org
 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
@@ -4098,8 +4340,7 @@ F:        include/linux/hpet.h
 F:     include/uapi/linux/hpet.h
 
 HPET:  x86
-M:     "Venkatesh Pallipadi (Venki)" <venki@google.com>
-S:     Maintained
+S:     Orphan
 F:     arch/x86/kernel/hpet.c
 F:     arch/x86/include/asm/hpet.h
 
@@ -4110,9 +4351,11 @@ S:       Maintained
 F:     fs/hpfs/
 
 HSI SUBSYSTEM
-M:     Sebastian Reichel <sre@debian.org>
+M:     Sebastian Reichel <sre@kernel.org>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-hsi
+F:     Documentation/hsi.txt
 F:     drivers/hsi/
 F:     include/linux/hsi/
 F:     include/uapi/linux/hsi/
@@ -4153,7 +4396,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/
 
@@ -4216,7 +4459,8 @@ F:        drivers/i2c/i2c-stub.c
 I2C SUBSYSTEM
 M:     Wolfram Sang <wsa@the-dreams.de>
 L:     linux-i2c@vger.kernel.org
-W:     http://i2c.wiki.kernel.org/
+W:     https://i2c.wiki.kernel.org/
+Q:     https://patchwork.ozlabs.org/project/linux-i2c/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
 S:     Maintained
 F:     Documentation/i2c/
@@ -4226,6 +4470,12 @@ F:       include/linux/i2c-*.h
 F:     include/uapi/linux/i2c.h
 F:     include/uapi/linux/i2c-*.h
 
+I2C ACPI SUPPORT
+M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+L:     linux-i2c@vger.kernel.org
+L:     linux-acpi@vger.kernel.org
+S:     Maintained
+
 I2C-TAOS-EVM DRIVER
 M:     Jean Delvare <jdelvare@suse.de>
 L:     linux-i2c@vger.kernel.org
@@ -4266,7 +4516,7 @@ S:        Supported
 F:     drivers/crypto/nx/
 
 IBM Power 842 compression accelerator
-M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+M:     Nathan Fontenot <nfont@linux.vnet.ibm.com>
 S:     Supported
 F:     drivers/crypto/nx/nx-842.c
 F:     include/linux/nx842.h
@@ -4282,18 +4532,21 @@ L:      netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/ibm/ibmveth.*
 
-IBM Power Virtual SCSI/FC Device Drivers
-M:     Robert Jennings <rcj@linux.vnet.ibm.com>
+IBM Power Virtual SCSI Device Drivers
+M:     Nathan Fontenot <nfont@linux.vnet.ibm.com>
 L:     linux-scsi@vger.kernel.org
 S:     Supported
-F:     drivers/scsi/ibmvscsi/
-X:     drivers/scsi/ibmvscsi/ibmvstgt.c
+F:     drivers/scsi/ibmvscsi/ibmvscsi*
+F:     drivers/scsi/ibmvscsi/viosrp.h
 
-IBM ServeRAID RAID DRIVER
-P:     Jack Hammer
-M:     Dave Jeffery <ipslinux@adaptec.com>
-W:     http://www.developer.ibm.com/welcome/netfinity/serveraid.html
+IBM Power Virtual FC Device Drivers
+M:     Brian King <brking@linux.vnet.ibm.com>
+L:     linux-scsi@vger.kernel.org
 S:     Supported
+F:     drivers/scsi/ibmvscsi/ibmvfc*
+
+IBM ServeRAID RAID DRIVER
+S:     Orphan
 F:     drivers/scsi/ips.*
 
 ICH LPC AND GPIO DRIVER
@@ -4340,8 +4593,7 @@ S:        Supported
 F:     drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
-M:     Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
-M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
+M:     Alexander Aring <alex.aring@gmail.com>
 L:     linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)
 W:     http://apps.sourceforge.net/trac/linux-zigbee
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
@@ -4395,15 +4647,18 @@ S:      Maintained
 F:     drivers/ipack/
 
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
-M:     Mimi Zohar <zohar@us.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 M:     Dmitry Kasatkin <d.kasatkin@samsung.com>
+L:     linux-ima-devel@lists.sourceforge.net
+L:     linux-ima-user@lists.sourceforge.net
+L:     linux-security-module@vger.kernel.org
 S:     Supported
 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>
@@ -4451,8 +4706,7 @@ K:        \b(ABS|SYN)_MT_
 
 INTEL C600 SERIES SAS CONTROLLER DRIVER
 M:     Intel SCU Linux support <intel-linux-scu@intel.com>
-M:     Lukasz Dorau <lukasz.dorau@intel.com>
-M:     Maciej Patelczyk <maciej.patelczyk@intel.com>
+M:     Artur Paszkiewicz <artur.paszkiewicz@intel.com>
 M:     Dave Jiang <dave.jiang@intel.com>
 L:     linux-scsi@vger.kernel.org
 T:     git git://git.code.sf.net/p/intel-sas/isci
@@ -4471,13 +4725,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>
@@ -4489,8 +4743,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:     Dave Jiang <dave.jiang@intel.com>
@@ -4538,6 +4792,7 @@ M:        Greg Rose <gregory.v.rose@intel.com>
 M:     Alex Duyck <alexander.h.duyck@intel.com>
 M:     John Ronciak <john.ronciak@intel.com>
 M:     Mitch Williams <mitch.a.williams@intel.com>
+M:     Linux NICS <linux.nics@intel.com>
 L:     e1000-devel@lists.sourceforge.net
 W:     http://www.intel.com/support/feedback.htm
 W:     http://e1000.sourceforge.net/
@@ -4586,7 +4841,7 @@ F:        arch/x86/kernel/tboot.c
 INTEL WIRELESS WIMAX CONNECTION 2400
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com
-L:     wimax@linuxwimax.org
+L:     wimax@linuxwimax.org (subscribers-only)
 S:     Supported
 W:     http://linuxwimax.org
 F:     Documentation/wimax/README.i2400m
@@ -4715,6 +4970,14 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
 F:     kernel/irq/
+
+IRQCHIP DRIVERS
+M:     Thomas Gleixner <tglx@linutronix.de>
+M:     Jason Cooper <jason@lakedaemon.net>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
+T:     git git://git.infradead.org/users/jcooper/linux.git irqchip/core
 F:     drivers/irqchip/
 
 IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
@@ -4792,22 +5055,6 @@ S:       Maintained
 F:     Documentation/hwmon/it87
 F:     drivers/hwmon/it87.c
 
-IT913X MEDIA DRIVER
-M:     Malcolm Priestley <tvboxspy@gmail.com>
-L:     linux-media@vger.kernel.org
-W:     http://linuxtv.org/
-Q:     http://patchwork.linuxtv.org/project/linux-media/list/
-S:     Maintained
-F:     drivers/media/usb/dvb-usb-v2/it913x*
-
-IT913X FE MEDIA DRIVER
-M:     Malcolm Priestley <tvboxspy@gmail.com>
-L:     linux-media@vger.kernel.org
-W:     http://linuxtv.org/
-Q:     http://patchwork.linuxtv.org/project/linux-media/list/
-S:     Maintained
-F:     drivers/media/dvb-frontends/it913x-fe*
-
 IT913X MEDIA DRIVER
 M:     Antti Palosaari <crope@iki.fi>
 L:     linux-media@vger.kernel.org
@@ -4902,13 +5149,6 @@ S:       Maintained
 F:     Documentation/hwmon/k8temp
 F:     drivers/hwmon/k8temp.c
 
-KTAP
-M:     Jovi Zhangwei <jovi.zhangwei@gmail.com>
-W:     http://www.ktap.org
-L:     ktap@freelists.org
-S:     Maintained
-F:     drivers/staging/ktap/
-
 KCONFIG
 M:     "Yann E. MORIN" <yann.morin.1998@free.fr>
 L:     linux-kbuild@vger.kernel.org
@@ -4963,7 +5203,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/
@@ -5027,14 +5266,19 @@ F:      drivers/s390/kvm/
 
 KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 M:     Christoffer Dall <christoffer.dall@linaro.org>
+M:     Marc Zyngier <marc.zyngier@arm.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     kvmarm@lists.cs.columbia.edu
 W:     http://systems.cs.columbia.edu/projects/kvm-arm
 S:     Supported
 F:     arch/arm/include/uapi/asm/kvm*
 F:     arch/arm/include/asm/kvm*
 F:     arch/arm/kvm/
+F:     virt/kvm/arm/
+F:     include/kvm/arm_*
 
 KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64)
+M:     Christoffer Dall <christoffer.dall@linaro.org>
 M:     Marc Zyngier <marc.zyngier@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     kvmarm@lists.cs.columbia.edu
@@ -5063,8 +5307,8 @@ F:        include/keys/
 F:     security/keys/
 
 KEYS-TRUSTED
-M:     David Safford <safford@watson.ibm.com>
-M:     Mimi Zohar <zohar@us.ibm.com>
+M:     David Safford <safford@us.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
 L:     linux-security-module@vger.kernel.org
 L:     keyrings@linux-nfs.org
 S:     Supported
@@ -5074,8 +5318,8 @@ F:        security/keys/trusted.c
 F:     security/keys/trusted.h
 
 KEYS-ENCRYPTED
-M:     Mimi Zohar <zohar@us.ibm.com>
-M:     David Safford <safford@watson.ibm.com>
+M:     Mimi Zohar <zohar@linux.vnet.ibm.com>
+M:     David Safford <safford@us.ibm.com>
 L:     linux-security-module@vger.kernel.org
 L:     keyrings@linux-nfs.org
 S:     Supported
@@ -5213,6 +5457,7 @@ F:        arch/powerpc/boot/rs6000.h
 LINUX FOR POWERPC (32-BIT AND 64-BIT)
 M:     Benjamin Herrenschmidt <benh@kernel.crashing.org>
 M:     Paul Mackerras <paulus@samba.org>
+M:     Michael Ellerman <mpe@ellerman.id.au>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
 Q:     http://patchwork.ozlabs.org/project/linuxppc-dev/list/
@@ -5232,17 +5477,16 @@ F:      drivers/macintosh/
 LINUX FOR POWERPC EMBEDDED MPC5XXX
 M:     Anatolij Gustschin <agust@denx.de>
 L:     linuxppc-dev@lists.ozlabs.org
-T:     git git://git.denx.de/linux-2.6-agust.git
+T:     git git://git.denx.de/linux-denx-agust.git
 S:     Maintained
 F:     arch/powerpc/platforms/512x/
 F:     arch/powerpc/platforms/52xx/
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
-M:     Josh Boyer <jwboyer@gmail.com>
+M:  Alistair Popple <alistair@popple.id.au>
 M:     Matt Porter <mporter@kernel.crashing.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
 S:     Maintained
 F:     arch/powerpc/platforms/40x/
 F:     arch/powerpc/platforms/44x/
@@ -5255,16 +5499,17 @@ F:      arch/powerpc/*/*/*virtex*
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 M:     Vitaly Bordug <vitb@kernel.crashing.org>
-M:     Marcelo Tosatti <marcelo@kvack.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     arch/powerpc/platforms/8xx/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
+M:     Scott Wood <scottwood@freescale.com>
 M:     Kumar Gala <galak@kernel.crashing.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
+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/
@@ -5374,10 +5619,11 @@ S:      Maintained
 F:     arch/arm/mach-lpc32xx/
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
-M:     Nagalakshmi Nandigama <Nagalakshmi.Nandigama@lsi.com>
-M:     Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
-M:     support@lsi.com
-L:     DL-MPTFusionLinux@lsi.com
+M:     Nagalakshmi Nandigama <nagalakshmi.nandigama@avagotech.com>
+M:     Praveen Krishnamoorthy <praveen.krishnamoorthy@avagotech.com>
+M:     Sreekanth Reddy <sreekanth.reddy@avagotech.com>
+M:     Abhijit Mahajan <abhijit.mahajan@avagotech.com>
+L:     MPT-FusionLinux.pdl@avagotech.com
 L:     linux-scsi@vger.kernel.org
 W:     http://www.lsilogic.com/support
 S:     Supported
@@ -5399,15 +5645,15 @@ F:      Documentation/hwmon/ltc4261
 F:     drivers/hwmon/ltc4261.c
 
 LTP (Linux Test Project)
-M:     Shubham Goyal <shubham@linux.vnet.ibm.com>
 M:     Mike Frysinger <vapier@gentoo.org>
 M:     Cyril Hrubis <chrubis@suse.cz>
-M:     Caspar Zhang <caspar@casparzhang.com>
 M:     Wanlong Gao <gaowanlong@cn.fujitsu.com>
+M:     Jan Stancek <jstancek@redhat.com>
+M:     Stanislav Kholmanskikh <stanislav.kholmanskikh@oracle.com>
+M:     Alexey Kodanev <alexey.kodanev@oracle.com>
 L:     ltp-list@lists.sourceforge.net (subscribers-only)
-W:     http://ltp.sourceforge.net/
+W:     http://linux-test-project.github.io/
 T:     git git://github.com/linux-test-project/ltp.git
-T:     git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev
 S:     Maintained
 
 M32R ARCHITECTURE
@@ -5486,16 +5732,6 @@ F:       Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
 
-MAC80211 PID RATE CONTROL
-M:     Stefano Brivio <stefano.brivio@polimi.it>
-M:     Mattias Nissler <mattias.nissler@gmx.de>
-L:     linux-wireless@vger.kernel.org
-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 <kaber@trash.net>
 L:     netdev@vger.kernel.org
@@ -5540,7 +5776,8 @@ S:        Maintained
 F:     drivers/net/ethernet/marvell/mvneta.*
 
 MARVELL MWIFIEX WIRELESS DRIVER
-M:     Bing Zhao <bzhao@marvell.com>
+M:     Amitkumar Karwar <akarwar@marvell.com>
+M:     Avinash Patil <patila@marvell.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/net/wireless/mwifiex/
@@ -5559,7 +5796,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
@@ -5651,17 +5888,6 @@ F:       include/linux/memory_hotplug.h
 F:     include/linux/vmalloc.h
 F:     mm/
 
-MEMORY RESOURCE CONTROLLER
-M:     Johannes Weiner <hannes@cmpxchg.org>
-M:     Michal Hocko <mhocko@suse.cz>
-M:     Balbir Singh <bsingharora@gmail.com>
-M:     KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
-L:     cgroups@vger.kernel.org
-L:     linux-mm@kvack.org
-S:     Maintained
-F:     mm/memcontrol.c
-F:     mm/page_cgroup.c
-
 MEMORY TECHNOLOGY DEVICES (MTD)
 M:     David Woodhouse <dwmw2@infradead.org>
 M:     Brian Norris <computersforpeace@gmail.com>
@@ -5680,6 +5906,12 @@ L:       linux-watchdog@vger.kernel.org
 S:     Supported
 F:     drivers/watchdog/mena21_wdt.c
 
+MEN CHAMELEON BUS (mcb)
+M:     Johannes Thumshirn <johannes.thumshirn@men.de>
+S:     Supported
+F:     drivers/mcb/
+F:     include/linux/mcb.h
+
 METAG ARCHITECTURE
 M:     James Hogan <james.hogan@imgtec.com>
 L:     linux-metag@vger.kernel.org
@@ -5691,11 +5923,9 @@ 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>
-L:     microblaze-uclinux@itee.uq.edu.au (moderated for non-subscribers)
 W:     http://www.monstr.eu/fdt/
 T:     git git://git.monstr.eu/linux-2.6-microblaze.git
 S:     Supported
@@ -5772,6 +6002,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 <alan@signal11.us>
+L:     linux-wpan@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ieee802154/mrf24j40.c
+
 MSI LAPTOP SUPPORT
 M:     "Lee, Chun-Yi" <jlee@suse.com>
 L:     platform-driver-x86@vger.kernel.org
@@ -5784,6 +6020,26 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/x86/msi-wmi.c
 
+MSI001 MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+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/msi001*
+
+MSI2500 MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+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/msi2500/
+
 MT9M032 APTINA SENSOR DRIVER
 M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
@@ -5819,16 +6075,17 @@ F:      include/media/mt9v032.h
 MULTIFUNCTION DEVICES (MFD)
 M:     Samuel Ortiz <sameo@linux.intel.com>
 M:     Lee Jones <lee.jones@linaro.org>
-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/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 M:     Chris Ball <chris@printf.net>
+M:     Ulf Hansson <ulf.hansson@linaro.org>
 L:     linux-mmc@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
+T:     git git://git.linaro.org/people/ulf.hansson/mmc.git
 S:     Maintained
 F:     drivers/mmc/
 F:     include/linux/mmc/
@@ -5890,6 +6147,28 @@ M:       Petr Vandrovec <petr@vandrovec.name>
 S:     Odd Fixes
 F:     fs/ncpfs/
 
+NCR 5380 SCSI DRIVERS
+M:     Finn Thain <fthain@telegraphics.com.au>
+M:     Michael Schmitz <schmitzmic@gmail.com>
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+F:     Documentation/scsi/g_NCR5380.txt
+F:     drivers/scsi/NCR5380.*
+F:     drivers/scsi/arm/cumana_1.c
+F:     drivers/scsi/arm/oak.c
+F:     drivers/scsi/atari_NCR5380.c
+F:     drivers/scsi/atari_scsi.*
+F:     drivers/scsi/dmx3191d.c
+F:     drivers/scsi/dtc.*
+F:     drivers/scsi/g_NCR5380.*
+F:     drivers/scsi/g_NCR5380_mmio.c
+F:     drivers/scsi/mac_scsi.*
+F:     drivers/scsi/pas16.*
+F:     drivers/scsi/sun3_NCR5380.c
+F:     drivers/scsi/sun3_scsi.*
+F:     drivers/scsi/sun3_scsi_vme.c
+F:     drivers/scsi/t128.*
+
 NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)
 M:     "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
 L:     linux-scsi@vger.kernel.org
@@ -5924,12 +6203,11 @@ F:      Documentation/networking/s2io.txt
 F:     Documentation/networking/vxge.txt
 F:     drivers/net/ethernet/neterion/
 
-NETFILTER/IPTABLES
+NETFILTER ({IP,IP6,ARP,EB,NF}TABLES)
 M:     Pablo Neira Ayuso <pablo@netfilter.org>
 M:     Patrick McHardy <kaber@trash.net>
 M:     Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
 L:     netfilter-devel@vger.kernel.org
-L:     netfilter@vger.kernel.org
 L:     coreteam@netfilter.org
 W:     http://www.netfilter.org/
 W:     http://www.iptables.org/
@@ -5998,6 +6276,8 @@ F:        include/uapi/linux/net.h
 F:     include/uapi/linux/netdevice.h
 F:     tools/net/
 F:     tools/testing/selftests/net/
+F:     lib/random32.c
+F:     lib/test_bpf.c
 
 NETWORKING [IPv4/IPv6]
 M:     "David S. Miller" <davem@davemloft.net>
@@ -6021,6 +6301,7 @@ L:        netdev@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
 S:     Maintained
+F:     net/core/flow.c
 F:     net/xfrm/
 F:     net/key/
 F:     net/ipv4/xfrm*
@@ -6096,6 +6377,7 @@ F:        include/net/nfc/
 F:     include/uapi/linux/nfc.h
 F:     drivers/nfc/
 F:     include/linux/platform_data/pn544.h
+F:     Documentation/devicetree/bindings/net/nfc/
 
 NFS, SUNRPC, AND LOCKD CLIENTS
 M:     Trond Myklebust <trond.myklebust@primarydata.com>
@@ -6114,10 +6396,10 @@ F:      include/uapi/linux/nfs*
 F:     include/uapi/linux/sunrpc/
 
 NILFS2 FILESYSTEM
-M:     KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
+M:     Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
 L:     linux-nilfs@vger.kernel.org
-W:     http://www.nilfs.org/en/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git
+W:     http://nilfs.sourceforge.net/
+T:     git git://github.com/konis/nilfs2.git
 S:     Supported
 F:     Documentation/filesystems/nilfs2.txt
 F:     fs/nilfs2/
@@ -6139,7 +6421,8 @@ F:        Documentation/scsi/NinjaSCSI.txt
 F:     drivers/scsi/nsp32*
 
 NTB DRIVER
-M:     Jon Mason <jon.mason@intel.com>
+M:     Jon Mason <jdmason@kudzu.us>
+M:     Dave Jiang <dave.jiang@intel.com>
 S:     Supported
 W:     https://github.com/jonmason/ntb/wiki
 T:     git git://github.com/jonmason/ntb.git
@@ -6160,8 +6443,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>
@@ -6231,14 +6514,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
@@ -6279,11 +6562,12 @@ L:      linux-omap@vger.kernel.org
 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 <laurent.pinchart@ideasonboard.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     drivers/media/platform/omap3isp/
+F:     drivers/staging/media/omap4iss/
 
 OMAP USB SUPPORT
 M:     Felipe Balbi <balbi@ti.com>
@@ -6295,6 +6579,7 @@ F:        drivers/usb/*/*omap*
 F:     arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
+M:     Javier Martinez Canillas <javier@dowhile0.org>
 M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
 M:     Kevin Hilman <khilman@deeprootsystems.com>
 L:     linux-omap@vger.kernel.org
@@ -6391,10 +6676,10 @@ T:      git git://openrisc.net/~jonas/linux
 F:     arch/openrisc/
 
 OPENVSWITCH
-M:     Jesse Gross <jesse@nicira.com>
+M:     Pravin Shelar <pshelar@nicira.com>
 L:     dev@openvswitch.org
 W:     http://openvswitch.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
 S:     Maintained
 F:     net/openvswitch/
 
@@ -6434,7 +6719,7 @@ F:        drivers/net/wireless/orinoco/
 
 OSD LIBRARY and FILESYSTEM
 M:     Boaz Harrosh <bharrosh@panasas.com>
-M:     Benny Halevy <bhalevy@tonian.com>
+M:     Benny Halevy <bhalevy@primarydata.com>
 L:     osd-dev@open-osd.org
 W:     http://open-osd.org
 T:     git git://git.open-osd.org/open-osd.git
@@ -6528,7 +6813,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*
 
@@ -6584,10 +6869,11 @@ F:      Documentation/PCI/
 F:     drivers/pci/
 F:     include/linux/pci*
 F:     arch/x86/pci/
+F:     arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:     Richard Zhu <r65037@freescale.com>
-M:     Shawn Guo <shawn.guo@linaro.org>
+M:     Lucas Stach <l.stach@pengutronix.de>
 L:     linux-pci@vger.kernel.org
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
@@ -6609,6 +6895,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 <kishon@ti.com>
+L:     linux-omap@vger.kernel.org
+L:     linux-pci@vger.kernel.org
+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 <horms@verge.net.au>
 L:     linux-pci@vger.kernel.org
@@ -6631,6 +6925,20 @@ L:       linux-pci@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/host/*designware*
 
+PCI DRIVER FOR GENERIC OF HOSTS
+M:     Will Deacon <will.deacon@arm.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+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 <mohit.kumar@st.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     drivers/pci/host/*spear*
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org
@@ -6673,7 +6981,7 @@ PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <a.p.zijlstra@chello.nl>
 M:     Paul Mackerras <paulus@samba.org>
 M:     Ingo Molnar <mingo@redhat.com>
-M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
+M:     Arnaldo Carvalho de Melo <acme@kernel.org>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:     Supported
@@ -6720,9 +7028,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>
@@ -6736,15 +7044,19 @@ L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/pinctrl/pinctrl-at91.c
 
+PIN CONTROLLER - RENESAS
+M:     Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+L:     linux-sh@vger.kernel.org
+S:     Maintained
+F:     drivers/pinctrl/sh-pfc/
+
 PIN CONTROLLER - SAMSUNG
-M:     Tomasz Figa <t.figa@samsung.com>
+M:     Tomasz Figa <tomasz.figa@gmail.com>
 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>
@@ -6765,10 +7077,10 @@ PKUNITY SOC DRIVERS
 M:     Guan Xuetao <gxt@mprc.pku.edu.cn>
 W:     http://mprc.pku.edu.cn/~guanxuetao/linux
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+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
@@ -6792,6 +7104,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/
@@ -6800,14 +7113,16 @@ POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 L:     linux-kernel@vger.kernel.org
 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 <sre@kernel.org>
 M:     Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:     David Woodhouse <dwmw2@infradead.org>
+L:     linux-pm@vger.kernel.org
 T:     git git://git.infradead.org/battery-2.6.git
 S:     Maintained
 F:     include/linux/power_supply.h
@@ -6815,7 +7130,6 @@ F:        drivers/power/
 
 PNP SUPPORT
 M:     Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-M:     Bjorn Helgaas <bhelgaas@google.com>
 S:     Maintained
 F:     drivers/pnp/
 
@@ -6940,7 +7254,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
@@ -6990,7 +7304,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/
@@ -6999,7 +7313,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>
@@ -7018,6 +7332,12 @@ M:       Robert Jarzmik <robert.jarzmik@free.fr>
 L:     rtc-linux@googlegroups.com
 S:     Maintained
 
+QAT DRIVER
+M:      Tadeusz Struk <tadeusz.struk@intel.com>
+L:      qat-linux@intel.com
+S:      Supported
+F:      drivers/crypto/qat/
+
 QIB DRIVER
 M:     Mike Marciniszyn <infinipath@intel.com>
 L:     linux-rdma@vger.kernel.org
@@ -7055,13 +7375,8 @@ F:       Documentation/networking/LICENSE.qla3xxx
 F:     drivers/net/ethernet/qlogic/qla3xxx.*
 
 QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
-M:     Himanshu Madhani <himanshu.madhani@qlogic.com>
-M:     Rajesh Borundia <rajesh.borundia@qlogic.com>
 M:     Shahed Shaikh <shahed.shaikh@qlogic.com>
-M:     Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
-M:     Sony Chacko <sony.chacko@qlogic.com>
-M:     Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
-M:     linux-driver@qlogic.com
+M:     Dept-HSGLinuxNICDev@qlogic.com
 L:     netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/qlogic/qlcnic/
@@ -7146,7 +7461,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
@@ -7168,12 +7483,11 @@ 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
 M:     Ivo van Doorn <IvDoorn@gmail.com>
-M:     Gertjan van Wingerde <gwingerde@gmail.com>
 M:     Helmut Schaa <helmut.schaa@googlemail.com>
 L:     linux-wireless@vger.kernel.org
 L:     users@rt2x00.serialmonkey.com (moderated for non-subscribers)
@@ -7189,7 +7503,7 @@ F:        Documentation/blockdev/ramdisk.txt
 F:     drivers/block/brd.c
 
 RANDOM NUMBER DRIVER
-M:     Theodore Ts'o" <tytso@mit.edu>
+M:     "Theodore Ts'o" <tytso@mit.edu>
 S:     Maintained
 F:     drivers/char/random.c
 
@@ -7205,16 +7519,20 @@ S:      Orphan
 F:     drivers/net/wireless/ray*
 
 RCUTORTURE MODULE
-M:     Josh Triplett <josh@freedesktop.org>
+M:     Josh Triplett <josh@joshtriplett.org>
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
 L:     linux-kernel@vger.kernel.org
 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" <paulmck@linux.vnet.ibm.com>
+M:     Josh Triplett <josh@joshtriplett.org>
+R:     Steven Rostedt <rostedt@goodmis.org>
+R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+R:     Lai Jiangshan <laijs@cn.fujitsu.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
@@ -7237,8 +7555,11 @@ S:       Supported
 F:     net/rds/
 
 READ-COPY UPDATE (RCU)
-M:     Dipankar Sarma <dipankar@in.ibm.com>
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     Josh Triplett <josh@joshtriplett.org>
+R:     Steven Rostedt <rostedt@goodmis.org>
+R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+R:     Lai Jiangshan <laijs@cn.fujitsu.com>
 L:     linux-kernel@vger.kernel.org
 W:     http://www.rdrop.com/users/paulmck/RCU/
 S:     Supported
@@ -7248,7 +7569,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 <a.zummo@towertech.it>
@@ -7260,6 +7581,13 @@ F:       drivers/rtc/
 F:     include/linux/rtc.h
 F:     include/uapi/linux/rtc.h
 
+REALTEK AUDIO CODECS
+M:     Bard Liao <bardliao@realtek.com>
+M:     Oder Chiou <oder_chiou@realtek.com>
+S:     Maintained
+F:     sound/soc/codecs/rt*
+F:     include/sound/rt*.h
+
 REISERFS FILE SYSTEM
 L:     reiserfs-devel@vger.kernel.org
 S:     Supported
@@ -7288,6 +7616,14 @@ F:       drivers/rpmsg/
 F:     Documentation/rpmsg.txt
 F:     include/linux/rpmsg.h
 
+RESET CONTROLLER FRAMEWORK
+M:     Philipp Zabel <p.zabel@pengutronix.de>
+S:     Maintained
+F:     drivers/reset/
+F:     Documentation/devicetree/bindings/reset/
+F:     include/linux/reset.h
+F:     include/linux/reset-controller.h
+
 RFKILL
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org
@@ -7353,6 +7689,16 @@ T:       git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/dvb-frontends/rtl2832*
 
+RTL2832_SDR MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+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/rtl2832_sdr*
+
 RTL8180 WIRELESS DRIVER
 M:     "John W. Linville" <linville@tuxdriver.com>
 L:     linux-wireless@vger.kernel.org
@@ -7385,7 +7731,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>
@@ -7396,10 +7742,26 @@ W:      http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     arch/s390/
 F:     drivers/s390/
-F:     block/partitions/ibm.c
 F:     Documentation/s390/
 F:     Documentation/DocBook/s390*
 
+S390 COMMON I/O LAYER
+M:     Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:     Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+L:     linux-s390@vger.kernel.org
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+F:     drivers/s390/cio/
+
+S390 DASD DRIVER
+M:     Stefan Weinhuber <wein@de.ibm.com>
+M:     Stefan Haberland <stefan.haberland@de.ibm.com>
+L:     linux-s390@vger.kernel.org
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+F:     drivers/s390/block/dasd*
+F:     block/partitions/ibm.c
+
 S390 NETWORK DRIVERS
 M:     Ursula Braun <ursula.braun@de.ibm.com>
 M:     Frank Blaschka <blaschka@linux.vnet.ibm.com>
@@ -7409,6 +7771,15 @@ W:       http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/s390/net/
 
+S390 PCI SUBSYSTEM
+M:     Sebastian Ott <sebott@linux.vnet.ibm.com>
+M:     Gerald Schaefer <gerald.schaefer@de.ibm.com>
+L:     linux-s390@vger.kernel.org
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+F:     arch/s390/pci/
+F:     drivers/pci/hotplug/s390_pci_hpc.c
+
 S390 ZCRYPT DRIVER
 M:     Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
 M:     linux390@de.ibm.com
@@ -7483,7 +7854,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>
@@ -7502,7 +7873,6 @@ L:        linux-media@vger.kernel.org
 Q:     https://patchwork.linuxtv.org/project/linux-media/list/
 S:     Supported
 F:     drivers/media/platform/exynos4-is/
-F:     include/media/s5p_fimc.h
 
 SAMSUNG S3C24XX/S3C64XX SOC SERIES CAMIF DRIVER
 M:     Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
@@ -7527,11 +7897,33 @@ S:      Supported
 F:     drivers/media/i2c/s5k5baf.c
 
 SAMSUNG SOC CLOCK DRIVERS
-M:     Tomasz Figa <t.figa@samsung.com>
+M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
+M:     Tomasz Figa <tomasz.figa@gmail.com>
 S:     Supported
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 F:     drivers/clk/samsung/
 
+SAMSUNG SXGBE DRIVERS
+M:     Byungho An <bh74.an@samsung.com>
+M:     Girish K S <ks.giri@samsung.com>
+M:     Vipul Pandya <vipul.pandya@samsung.com>
+S:     Supported
+L:     netdev@vger.kernel.org
+F:     drivers/net/ethernet/samsung/sxgbe/
+
+SAMSUNG USB2 PHY DRIVER
+M:     Kamil Debski <k.debski@samsung.com>
+L:     linux-kernel@vger.kernel.org
+S:     Supported
+F:     Documentation/devicetree/bindings/phy/samsung-phy.txt
+F:     Documentation/phy/samsung-usb2.txt
+F:     drivers/phy/phy-exynos4210-usb2.c
+F:     drivers/phy/phy-exynos4x12-usb2.c
+F:     drivers/phy/phy-exynos5250-usb2.c
+F:     drivers/phy/phy-s5pv210-usb2.c
+F:     drivers/phy/phy-samsung-usb2.c
+F:     drivers/phy/phy-samsung-usb2.h
+
 SERIAL DRIVERS
 M:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:     linux-serial@vger.kernel.org
@@ -7553,6 +7945,11 @@ S:       Maintained
 F:     include/linux/mmc/dw_mmc.h
 F:     drivers/mmc/host/dw_mmc*
 
+THUNDERBOLT DRIVER
+M:     Andreas Noever <andreas.noever@gmail.com>
+S:     Maintained
+F:     drivers/thunderbolt/
+
 TIMEKEEPING, CLOCKSOURCE CORE, NTP
 M:     John Stultz <john.stultz@linaro.org>
 M:     Thomas Gleixner <tglx@linutronix.de>
@@ -7688,6 +8085,16 @@ S:       Maintained
 F:     drivers/mmc/host/sdhci.*
 F:     drivers/mmc/host/sdhci-pltfm.[ch]
 
+SECURE COMPUTING
+M:     Kees Cook <keescook@chromium.org>
+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 <anton@enomsg.org>
 L:     linuxppc-dev@lists.ozlabs.org
@@ -7710,6 +8117,7 @@ F:        drivers/mmc/host/sdhci-spear.c
 
 SECURITY SUBSYSTEM
 M:     James Morris <james.l.morris@oracle.com>
+M:     Serge E. Hallyn <serge@hallyn.com>
 L:     linux-security-module@vger.kernel.org (suggested Cc:)
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
 W:     http://kernsec.org/
@@ -7721,11 +8129,10 @@ M:      Security Officers <security@kernel.org>
 S:     Supported
 
 SELINUX SECURITY MODULE
+M:     Paul Moore <paul@paul-moore.com>
 M:     Stephen Smalley <sds@tycho.nsa.gov>
-M:     James Morris <james.l.morris@oracle.com>
 M:     Eric Paris <eparis@parisplace.org>
-M:     Paul Moore <paul@paul-moore.com>
-L:     selinux@tycho.nsa.gov (subscribers-only, general discussion)
+L:     selinux@tycho.nsa.gov (moderated for non-subscribers)
 W:     http://selinuxproject.org
 T:     git git://git.infradead.org/users/pcmoore/selinux
 S:     Supported
@@ -7756,6 +8163,16 @@ F:       drivers/ata/
 F:     include/linux/ata.h
 F:     include/linux/libata.h
 
+SERIAL ATA AHCI PLATFORM devices support
+M:     Hans de Goede <hdegoede@redhat.com>
+M:     Tejun Heo <tj@kernel.org>
+L:     linux-ide@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
+S:     Supported
+F:     drivers/ata/ahci_platform.c
+F:     drivers/ata/libahci_platform.c
+F:     include/linux/ahci_platform.h
+
 SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
 M:     Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
 L:     linux-scsi@vger.kernel.org
@@ -7792,19 +8209,32 @@ F:      Documentation/ia64/serial.txt
 F:     drivers/tty/serial/ioc?_serial.c
 F:     include/linux/ioc?.h
 
-SGI VISUAL WORKSTATION 320 AND 540
-M:     Andrey Panin <pazke@donpac.ru>
-L:     linux-visws-devel@lists.sf.net
-W:     http://linux-visws.sf.net
-S:     Maintained for 2.6.
-F:     Documentation/sgi-visws.txt
-
 SGI XP/XPC/XPNET DRIVER
 M:     Cliff Whickman <cpw@sgi.com>
 M:     Robin Holt <robinmholt@gmail.com>
 S:     Maintained
 F:     drivers/misc/sgi-xp/
 
+SI2157 MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+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/si2157*
+
+SI2168 MEDIA DRIVER
+M:     Antti Palosaari <crope@iki.fi>
+L:     linux-media@vger.kernel.org
+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/si2168*
+
 SI470X FM RADIO RECEIVER I2C DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
 L:     linux-media@vger.kernel.org
@@ -7859,15 +8289,13 @@ F:      drivers/media/usb/siano/
 F:     drivers/media/mmc/siano/
 
 SH_VEU V4L2 MEM2MEM DRIVER
-M:     Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 L:     linux-media@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/media/platform/sh_veu.c
 
 SH_VOU V4L2 OUTPUT DRIVER
-M:     Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 L:     linux-media@vger.kernel.org
-S:     Odd Fixes
+S:     Orphan
 F:     drivers/media/platform/sh_vou.c
 F:     include/media/sh_vou.h
 
@@ -7937,7 +8365,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
@@ -7947,17 +8375,22 @@ S:      Maintained
 F:     drivers/usb/misc/sisusbvga/
 
 SLAB ALLOCATOR
-M:     Christoph Lameter <cl@linux-foundation.org>
+M:     Christoph Lameter <cl@linux.com>
 M:     Pekka Enberg <penberg@kernel.org>
-M:     Matt Mackall <mpm@selenic.com>
+M:     David Rientjes <rientjes@google.com>
+M:     Joonsoo Kim <iamjoonsoo.kim@lge.com>
+M:     Andrew Morton <akpm@linux-foundation.org>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     include/linux/sl?b*.h
-F:     mm/sl?b.c
+F:     mm/sl?b*
 
 SLEEPABLE READ-COPY UPDATE (SRCU)
 M:     Lai Jiangshan <laijs@cn.fujitsu.com>
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+M:     Josh Triplett <josh@joshtriplett.org>
+R:     Steven Rostedt <rostedt@goodmis.org>
+R:     Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 L:     linux-kernel@vger.kernel.org
 W:     http://www.rdrop.com/users/paulmck/RCU/
 S:     Supported
@@ -8041,7 +8474,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>
@@ -8057,6 +8490,12 @@ M:       Chris Boot <bootc@bootc.net>
 S:     Maintained
 F:     drivers/leds/leds-net48xx.c
 
+SOFTLOGIC 6x10 MPEG CODEC
+M:     Ismael Luceno <ismael.luceno@corp.bluecherry.net>
+L:     linux-media@vger.kernel.org
+S:     Supported
+F:     drivers/media/pci/solo6x10/
+
 SOFTWARE RAID (Multiple Disks) SUPPORT
 M:     Neil Brown <neilb@suse.de>
 L:     linux-raid@vger.kernel.org
@@ -8106,6 +8545,7 @@ L:        alsa-devel@alsa-project.org (moderated for non-subscribers)
 W:     http://www.alsa-project.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git
 T:     git git://git.alsa-project.org/alsa-kernel.git
+Q:     http://patchwork.kernel.org/project/alsa-devel/list/
 S:     Maintained
 F:     Documentation/sound/
 F:     include/sound/
@@ -8177,7 +8617,7 @@ F:        include/linux/compiler.h
 
 SPEAR PLATFORM SUPPORT
 M:     Viresh Kumar <viresh.linux@gmail.com>
-M:     Shiraz Hashim <shiraz.hashim@st.com>
+M:     Shiraz Hashim <shiraz.linux.kernel@gmail.com>
 L:     spear-devel@list.st.com
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.st.com/spear
@@ -8246,37 +8686,12 @@ L:      devel@driverdev.osuosl.org
 S:     Supported
 F:     drivers/staging/
 
-STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
-M:     Henk de Groot <pe1dnn@amsat.org>
-S:     Odd Fixes
-F:     drivers/staging/wlags49_h2/
-F:     drivers/staging/wlags49_h25/
-
-STAGING - ASUS OLED
-M:     Jakub Schmidtke <sjakub@gmail.com>
-S:     Odd Fixes
-F:     drivers/staging/asus_oled/
-
 STAGING - COMEDI
 M:     Ian Abbott <abbotti@mev.co.uk>
 M:     H Hartley Sweeten <hsweeten@visionengravers.com>
 S:     Odd Fixes
 F:     drivers/staging/comedi/
 
-STAGING - CRYSTAL HD VIDEO DECODER
-M:     Naren Sankar <nsankar@broadcom.com>
-M:     Jarod Wilson <jarod@wilsonet.com>
-M:     Scott Davilla <davilla@4pi.com>
-M:     Manu Abraham <abraham.manu@gmail.com>
-S:     Odd Fixes
-F:     drivers/staging/crystalhd/
-
-STAGING - ECHO CANCELLER
-M:     Steve Underwood <steveu@coppice.org>
-M:     David Rowe <david@rowetel.com>
-S:     Odd Fixes
-F:     drivers/staging/echo/
-
 STAGING - ET131X NETWORK DRIVER
 M:     Mark Einon <mark.einon@gmail.com>
 S:     Odd Fixes
@@ -8287,16 +8702,6 @@ M:       Marek Belisko <marek.belisko@gmail.com>
 S:     Odd Fixes
 F:     drivers/staging/ft1000/
 
-STAGING - FRONTIER TRANZPORT AND ALPHATRACK
-M:     David Täht <d@teklibre.com>
-S:     Odd Fixes
-F:     drivers/staging/frontier/
-
-STAGING - GO7007 MPEG CODEC
-M:     Hans Verkuil <hans.verkuil@cisco.com>
-S:     Maintained
-F:     drivers/staging/media/go7007/
-
 STAGING - INDUSTRIAL IO
 M:     Jonathan Cameron <jic23@kernel.org>
 L:     linux-iio@vger.kernel.org
@@ -8326,7 +8731,7 @@ S:        Maintained
 F:     drivers/staging/olpc_dcon/
 
 STAGING - OZMO DEVICES USB OVER WIFI DRIVER
-M:     Rupesh Gujare <rupesh.gujare@atmel.com>
+M:     Shigekatsu Tateno <shigekatsu.tateno@atmel.com>
 S:     Maintained
 F:     drivers/staging/ozwpan/
 
@@ -8341,46 +8746,34 @@ M:      Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 S:     Odd Fixes
 F:     drivers/staging/rtl8712/
 
-STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
-M:     Teddy Wang <teddy.wang@siliconmotion.com.cn>
-S:     Odd Fixes
-F:     drivers/staging/sm7xxfb/
+STAGING - REALTEK RTL8723U WIRELESS DRIVER
+M:     Larry Finger <Larry.Finger@lwfinger.net>
+M:     Jes Sorensen <Jes.Sorensen@redhat.com>
+L:     linux-wireless@vger.kernel.org
+S:     Maintained
+F:     drivers/staging/rtl8723au/
 
-STAGING - SOFTLOGIC 6x10 MPEG CODEC
-M:     Ismael Luceno <ismael.luceno@corp.bluecherry.net>
-S:     Supported
-F:     drivers/staging/media/solo6x10/
+STAGING - SLICOSS
+M:     Lior Dotan <liodot@gmail.com>
+M:     Christopher Harrer <charrer@alacritech.com>
+S:     Odd Fixes
+F:     drivers/staging/slicoss/
 
 STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 M:     William Hubbs <w.d.hubbs@gmail.com>
 M:     Chris Brannon <chris@the-brannons.com>
 M:     Kirk Reiser <kirk@reisers.ca>
 M:     Samuel Thibault <samuel.thibault@ens-lyon.org>
-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 <omar.ramirez@copitl.com>
-S:     Odd Fixes
-F:     drivers/staging/tidspbridge/
-
-STAGING - USB ENE SM/MS CARD READER DRIVER
-M:     Al Cho <acho@novell.com>
-S:     Odd Fixes
-F:     drivers/staging/keucr/
-
 STAGING - VIA VT665X DRIVERS
 M:     Forest Bond <forest@alittletooquiet.net>
 S:     Odd Fixes
 F:     drivers/staging/vt665?/
 
-STAGING - WINBOND IS89C35 WLAN USB DRIVER
-M:     Pavel Machek <pavel@ucw.cz>
-S:     Odd Fixes
-F:     drivers/staging/winbond/
-
 STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
 M:     Arnaud Patard <arnaud.patard@rtp-net.org>
 S:     Odd Fixes
@@ -8407,20 +8800,18 @@ S:      Maintained
 F:     drivers/net/ethernet/dlink/sundance.c
 
 SUPERH
-M:     Paul Mundt <lethal@linux-sh.org>
 L:     linux-sh@vger.kernel.org
 W:     http://www.linux-sh.org
 Q:     http://patchwork.kernel.org/project/linux-sh/list/
-T:     git git://github.com/pmundt/linux-sh.git sh-latest
-S:     Supported
+S:     Orphan
 F:     Documentation/sh/
 F:     arch/sh/
 F:     drivers/sh/
 
 SUSPEND TO RAM
+M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 M:     Len Brown <len.brown@intel.com>
 M:     Pavel Machek <pavel@ucw.cz>
-M:     "Rafael J. Wysocki" <rjw@rjwysocki.net>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     Documentation/power/
@@ -8618,7 +9009,7 @@ M:        Stephen Warren <swarren@wwwdotorg.org>
 M:     Thierry Reding <thierry.reding@gmail.com>
 L:     linux-tegra@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-tegra/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git
 S:     Supported
 N:     [^a-z]tegra
 
@@ -8696,6 +9087,7 @@ M:        Max Filippov <jcmvbkbc@gmail.com>
 L:     linux-xtensa@linux-xtensa.org
 S:     Maintained
 F:     arch/xtensa/
+F:     drivers/irqchip/irq-xtensa-*
 
 THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
 M:     Hans Verkuil <hverkuil@xs4all.nl>
@@ -8707,7 +9099,7 @@ F:        drivers/media/radio/radio-raremono.c
 
 THERMAL
 M:     Zhang Rui <rui.zhang@intel.com>
-M:     Eduardo Valentin <eduardo.valentin@ti.com>
+M:     Eduardo Valentin <edubezval@gmail.com>
 L:     linux-pm@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
@@ -8734,11 +9126,18 @@ S:      Maintained
 F:     drivers/platform/x86/thinkpad_acpi.c
 
 TI BANDGAP AND THERMAL DRIVER
-M:     Eduardo Valentin <eduardo.valentin@ti.com>
+M:     Eduardo Valentin <edubezval@gmail.com>
 L:     linux-pm@vger.kernel.org
 S:     Supported
 F:     drivers/thermal/ti-soc-thermal/
 
+TI CLOCK DRIVER
+M:     Tero Kristo <t-kristo@ti.com>
+L:     linux-omap@vger.kernel.org
+S:     Maintained
+F:     drivers/clk/ti/
+F:     include/linux/clk/ti.h
+
 TI FLASH MEDIA INTERFACE DRIVER
 M:     Alex Dubov <oakad@yahoo.com>
 S:     Maintained
@@ -8857,7 +9256,7 @@ F:        include/linux/toshiba.h
 F:     include/uapi/linux/toshiba.h
 
 TMIO MMC DRIVER
-M:     Ian Molton <ian@mnementh.co.uk>
+M:     Ian Molton <ian.molton@codethink.co.uk>
 L:     linux-mmc@vger.kernel.org
 S:     Maintained
 F:     drivers/mmc/host/tmio_mmc*
@@ -8898,7 +9297,6 @@ F:        drivers/char/tpm/
 
 TRACING
 M:     Steven Rostedt <rostedt@goodmis.org>
-M:     Frederic Weisbecker <fweisbec@gmail.com>
 M:     Ingo Molnar <mingo@redhat.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:     Maintained
@@ -8955,6 +9353,9 @@ F:        arch/um/os-Linux/drivers/
 
 TURBOCHANNEL SUBSYSTEM
 M:     "Maciej W. Rozycki" <macro@linux-mips.org>
+M:     Ralf Baechle <ralf@linux-mips.org>
+L:     linux-mips@linux-mips.org
+Q:     http://patchwork.linux-mips.org/project/linux-mips/list/
 S:     Maintained
 F:     drivers/tc/
 F:     include/linux/tc.h
@@ -9013,7 +9414,7 @@ UNICORE32 ARCHITECTURE:
 M:     Guan Xuetao <gxt@mprc.pku.edu.cn>
 W:     http://mprc.pku.edu.cn/~guanxuetao/linux
 S:     Maintained
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git
+T:     git git://github.com/gxt/linux.git
 F:     arch/unicore32/
 
 UNIFDEF
@@ -9031,6 +9432,13 @@ F:       drivers/cdrom/cdrom.c
 F:     include/linux/cdrom.h
 F:     include/uapi/linux/cdrom.h
 
+UNISYS S-PAR DRIVERS
+M:     Benjamin Romer <benjamin.romer@unisys.com>
+M:     David Kershner <david.kershner@unisys.com>
+L:     sparmaintainer@unisys.com (Unisys internal)
+S:     Supported
+F:     drivers/staging/unisys/
+
 UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
 M:     Vinayak Holikatti <vinholikatti@gmail.com>
 M:     Santosh Y <santoshsy@gmail.com>
@@ -9069,8 +9477,7 @@ S:        Maintained
 F:     drivers/net/wireless/ath/ar5523/
 
 USB ATTACHED SCSI
-M:     Matthew Wilcox <willy@linux.intel.com>
-M:     Sarah Sharp <sarah.a.sharp@linux.intel.com>
+M:     Hans de Goede <hdegoede@redhat.com>
 M:     Gerd Hoffmann <kraxel@redhat.com>
 L:     linux-usb@vger.kernel.org
 L:     linux-scsi@vger.kernel.org
@@ -9140,12 +9547,6 @@ S:       Maintained
 F:     drivers/usb/host/isp116x*
 F:     include/linux/usb/isp116x.h
 
-USB KAWASAKI LSI DRIVER
-M:     Oliver Neukum <oliver@neukum.org>
-L:     linux-usb@vger.kernel.org
-S:     Maintained
-F:     drivers/usb/serial/kl5kusb105.*
-
 USB MASS STORAGE DRIVER
 M:     Matthew Dharm <mdharm-usb@one-eyed-alien.net>
 L:     linux-usb@vger.kernel.org
@@ -9173,11 +9574,13 @@ S:      Maintained
 F:     Documentation/usb/ohci.txt
 F:     drivers/usb/host/ohci*
 
-USB OPTION-CARD DRIVER
-M:     Matthias Urlichs <smurf@smurf.noris.de>
+USB OVER IP DRIVER
+M:     Valentina Manea <valentina.manea.m@gmail.com>
+M:     Shuah Khan <shuah.kh@samsung.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
-F:     drivers/usb/serial/option.c
+F:     drivers/usb/usbip/
+F:     tools/usb/usbip/
 
 USB PEGASUS DRIVER
 M:     Petko Manolov <petkan@nucleusys.com>
@@ -9211,7 +9614,7 @@ S:        Maintained
 F:     drivers/net/usb/rtl8150.c
 
 USB SERIAL SUBSYSTEM
-M:     Johan Hovold <jhovold@gmail.com>
+M:     Johan Hovold <johan@kernel.org>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     Documentation/usb/usb-serial.txt
@@ -9230,15 +9633,6 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/usb/smsc95xx.*
 
-USB SN9C1xx DRIVER
-M:     Luca Risolia <luca.risolia@studio.unibo.it>
-L:     linux-usb@vger.kernel.org
-L:     linux-media@vger.kernel.org
-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 <gregkh@linuxfoundation.org>
 L:     linux-usb@vger.kernel.org
@@ -9286,8 +9680,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>
@@ -9296,7 +9690,7 @@ S:        Maintained
 F:     drivers/net/wireless/rndis_wlan.c
 
 USB XHCI DRIVER
-M:     Sarah Sharp <sarah.a.sharp@linux.intel.com>
+M:     Mathias Nyman <mathias.nyman@intel.com>
 L:     linux-usb@vger.kernel.org
 S:     Supported
 F:     drivers/usb/host/xhci*
@@ -9352,7 +9746,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>
@@ -9380,7 +9774,6 @@ F:        include/media/videobuf2-*
 
 VIRTIO CONSOLE DRIVER
 M:     Amit Shah <amit.shah@redhat.com>
-L:     virtio-dev@lists.oasis-open.org
 L:     virtualization@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/char/virtio_console.c
@@ -9390,7 +9783,6 @@ F:        include/uapi/linux/virtio_console.h
 VIRTIO CORE, NET AND BLOCK DRIVERS
 M:     Rusty Russell <rusty@rustcorp.com.au>
 M:     "Michael S. Tsirkin" <mst@redhat.com>
-L:     virtio-dev@lists.oasis-open.org
 L:     virtualization@lists.linux-foundation.org
 S:     Maintained
 F:     drivers/virtio/
@@ -9403,7 +9795,6 @@ F:        include/uapi/linux/virtio_*.h
 VIRTIO HOST (VHOST)
 M:     "Michael S. Tsirkin" <mst@redhat.com>
 L:     kvm@vger.kernel.org
-L:     virtio-dev@lists.oasis-open.org
 L:     virtualization@lists.linux-foundation.org
 L:     netdev@vger.kernel.org
 S:     Maintained
@@ -9428,7 +9819,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>
@@ -9477,6 +9868,14 @@ L:       virtualization@lists.linux-foundation.org
 S:     Supported
 F:     arch/x86/kernel/cpu/vmware.c
 
+VMWARE BALLOON DRIVER
+M:     Xavier Deguillard <xdeguillard@vmware.com>
+M:     Philip Moltmann <moltmann@vmware.com>
+M:     "VMware, Inc." <pv-drivers@vmware.com>
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     drivers/misc/vmw_balloon.c
+
 VMWARE VMXNET3 ETHERNET DRIVER
 M:     Shreyas Bhatewara <sbhatewara@vmware.com>
 M:     "VMware, Inc." <pv-drivers@vmware.com>
@@ -9553,6 +9952,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
@@ -9584,7 +9990,7 @@ F:        drivers/media/rc/winbond-cir.c
 WIMAX STACK
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com
-L:     wimax@linuxwimax.org
+L:     wimax@linuxwimax.org (subscribers-only)
 S:     Supported
 W:     http://linuxwimax.org
 F:     Documentation/wimax/README.wimax
@@ -9676,9 +10082,9 @@ F:       Documentation/x86/
 F:     arch/x86/
 
 X86 PLATFORM DRIVERS
-M:     Matthew Garrett <matthew.garrett@nebula.com>
+M:     Darren Hart <dvhart@infradead.org>
 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://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git
 S:     Maintained
 F:     drivers/platform/x86/
 
@@ -9740,6 +10146,13 @@ S:      Supported
 F:     arch/x86/pci/*xen*
 F:     drivers/pci/*xen*
 
+XEN BLOCK SUBSYSTEM
+M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
+L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
+S:     Supported
+F:     drivers/block/xen-blkback/*
+F:     drivers/block/xen*
+
 XEN SWIOTLB SUBSYSTEM
 M:     Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 L:     xen-devel@lists.xenproject.org (moderated for non-subscribers)
@@ -9774,6 +10187,12 @@ L:      linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/uartlite.c
 
+XTENSA XTFPGA PLATFORM SUPPORT
+M:     Max Filippov <jcmvbkbc@gmail.com>
+L:     linux-xtensa@linux-xtensa.org
+S:     Maintained
+F:     drivers/spi/spi-xtensa-xtfpga.c
+
 YAM DRIVER FOR AX.25
 M:     Jean-Paul Roubelat <jpr@f6fbb.org>
 L:     linux-hams@vger.kernel.org
@@ -9799,7 +10218,7 @@ F:       drivers/net/hamradio/*scc.c
 F:     drivers/net/hamradio/z8530.h
 
 ZBUD COMPRESSED PAGE ALLOCATOR
-M:     Seth Jennings <sjenning@linux.vnet.ibm.com>
+M:     Seth Jennings <sjennings@variantweb.net>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/zbud.c
@@ -9844,7 +10263,7 @@ F:       mm/zsmalloc.c
 F:     include/linux/zsmalloc.h
 
 ZSWAP COMPRESSED SWAP CACHING
-M:     Seth Jennings <sjenning@linux.vnet.ibm.com>
+M:     Seth Jennings <sjennings@variantweb.net>
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     mm/zswap.c