1 files changed, 191 insertions, 60 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 518bf717b02b..2507f38b208f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -93,6 +93,11 @@ Descriptions of section entries:
         N: Files and directories with regex patterns.
            N:   [^a-z]tegra     all files whose path contains the word tegra
            One pattern per line.  Multiple N: lines acceptable.
+           scripts/get_maintainer.pl has different behavior for files that
+           match F: pattern and matches of N: patterns.  By default,
+           get_maintainer will not look at git log history when an F: pattern
+           match occurs.  When an N: match occurs, git log history is used
+           to also notify the people that have git commit signatures.
         X: Files and directories that are NOT maintained, same rules as F:
            Files exclusions are tested before file matches.
            Can be useful for excluding a specific subdirectory, for instance:
@@ -252,6 +257,7 @@ F:	Documentation/ABI/testing/sysfs-bus-acpi
 F:      drivers/pci/*acpi*
 F:      drivers/pci/*/*acpi*
 F:      drivers/pci/*/*/*acpi*
+F:      tools/power/acpi
 
 ACPI COMPONENT ARCHITECTURE (ACPICA)
 M:      Robert Moore <robert.moore@intel.com>
@@ -266,6 +272,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 S:      Supported
 F:      drivers/acpi/acpica/
 F:      include/acpi/
+F:      tools/power/acpi/
 
 ACPI FAN DRIVER
 M:      Zhang Rui <rui.zhang@intel.com>
@@ -484,7 +491,6 @@ M:	Hannes Reinecke <hare@suse.de>
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 F:      drivers/scsi/aic7xxx/
-F:      drivers/scsi/aic7xxx_old/
 
 AIMSLAB FM RADIO RECEIVER DRIVER
 M:      Hans Verkuil <hverkuil@xs4all.nl>
@@ -539,6 +545,13 @@ F:	drivers/tty/serial/altera_jtaguart.c
 F:      include/linux/altera_uart.h
 F:      include/linux/altera_jtaguart.h
 
+AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER
+M:      Tom Lendacky <thomas.lendacky@amd.com>
+L:      linux-crypto@vger.kernel.org
+S:      Supported
+F:      drivers/crypto/ccp/
+F:      include/linux/ccp.h
+
 AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 M:      Andreas Herrmann <herrmann.der.user@googlemail.com>
 L:      lm-sensors@lm-sensors.org
@@ -766,7 +779,12 @@ ARM/Allwinner A1X SoC support
 M:      Maxime Ripard <maxime.ripard@free-electrons.com>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-F:      arch/arm/mach-sunxi/
+N:      sun[x4567]i
+
+ARM/Allwinner SoC Clock Support
+M:      Emilio López <emilio@elopez.com.ar>
+S:      Maintained
+F:      drivers/clk/sunxi/
 
 ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
 M:      Andrew Victor <linux@maxim.org.za>
@@ -783,7 +801,7 @@ F:	arch/arm/boot/dts/sama*.dts
 F:      arch/arm/boot/dts/sama*.dtsi
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
-M:      Rob Herring <rob.herring@calxeda.com>
+M:      Rob Herring <robh@kernel.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-highbank/
@@ -867,6 +885,12 @@ S:	Maintained
 F:      arch/arm/mach-ebsa110/
 F:      drivers/net/ethernet/amd/am79c961a.*
 
+ARM/ENERGY MICRO (SILICON LABS) EFM32 SUPPORT
+M:      Uwe Kleine-König <kernel@pengutronix.de>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+N:      efm32
+
 ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
 M:      Daniel Ribeiro <drwyrm@gmail.com>
 M:      Stefan Schmidt <stefan@openezx.org>
@@ -893,20 +917,15 @@ 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:      Sascha Hauer <kernel@pengutronix.de>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
-T:      git git://git.pengutronix.de/git/imx/linux-2.6.git
+T:      git git://git.linaro.org/people/shawnguo/linux-2.6.git
 F:      arch/arm/mach-imx/
+F:      arch/arm/boot/dts/imx*
 F:      arch/arm/configs/imx*_defconfig
 
-ARM/FREESCALE IMX6
-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-imx/*imx6*
-
 ARM/FREESCALE MXS ARM ARCHITECTURE
 M:      Shawn Guo <shawn.guo@linaro.org>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1013,6 +1032,8 @@ 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/LOGICPD PXA270 MACHINE SUPPORT
 M:      Lennert Buytenhek <kernel@wantstofly.org>
@@ -1032,6 +1053,12 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      arch/arm/mach-mvebu/
 
+ARM/Marvell Berlin SoC support
+M:      Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
+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
 M:      Jason Cooper <jason@lakedaemon.net>
 M:      Andrew Lunn <andrew@lunn.ch>
@@ -1325,6 +1352,14 @@ 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
 
+ARM/Ux500 CLOCK FRAMEWORK SUPPORT
+M:      Ulf Hansson <ulf.hansson@linaro.org>
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+T:      git git://git.linaro.org/people/ulfh/clk.git
+S:      Maintained
+F:      drivers/clk/ux500/
+F:      include/linux/platform_data/clk-ux500.h
+
 ARM/VFP SUPPORT
 M:      Russell King <linux@arm.linux.org.uk>
 L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1371,6 +1406,9 @@ T:	git git://git.xilinx.com/linux-xlnx.git
 S:      Supported
 F:      arch/arm/mach-zynq/
 F:      drivers/cpuidle/cpuidle-zynq.c
+N:      zynq
+N:      xilinx
+F:      drivers/clocksource/cadence_ttc_timer.c
 F:      drivers/mmc/host/sdhci-of-arasan.c
 
 ARM SMMU DRIVER
@@ -1436,7 +1474,7 @@ F:	Documentation/aoe/
 F:      drivers/block/aoe/
 
 ATHEROS ATH GENERIC UTILITIES
-M:      "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
+M:      "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
 L:      linux-wireless@vger.kernel.org
 S:      Supported
 F:      drivers/net/wireless/ath/*
@@ -1444,7 +1482,7 @@ F:	drivers/net/wireless/ath/*
 ATHEROS ATH5K WIRELESS DRIVER
 M:      Jiri Slaby <jirislaby@gmail.com>
 M:      Nick Kossifidis <mickflemm@gmail.com>
-M:      "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
+M:      "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
 L:      linux-wireless@vger.kernel.org
 L:      ath5k-devel@lists.ath5k.org
 W:      http://wireless.kernel.org/en/users/Drivers/ath5k
@@ -1459,17 +1497,6 @@ T:	git git://github.com/kvalo/ath.git
 S:      Supported
 F:      drivers/net/wireless/ath/ath6kl/
 
-ATHEROS ATH9K WIRELESS DRIVER
-M:      "Luis R. Rodriguez" <mcgrof@qca.qualcomm.com>
-M:      Jouni Malinen <jouni@qca.qualcomm.com>
-M:      Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
-M:      Senthil Balasubramanian <senthilb@qca.qualcomm.com>
-L:      linux-wireless@vger.kernel.org
-L:      ath9k-devel@lists.ath9k.org
-W:      http://wireless.kernel.org/en/users/Drivers/ath9k
-S:      Supported
-F:      drivers/net/wireless/ath/ath9k/
-
 WILOCITY WIL6210 WIRELESS DRIVER
 M:      Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
 L:      linux-wireless@vger.kernel.org
@@ -1599,11 +1626,10 @@ S:      Supported
 F:      drivers/scsi/esas2r
 
 AUDIT SUBSYSTEM
-M:      Al Viro <viro@zeniv.linux.org.uk>
 M:      Eric Paris <eparis@redhat.com>
 L:      linux-audit@redhat.com (subscribers-only)
 W:      http://people.redhat.com/sgrubb/audit/
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git
+T:      git git://git.infradead.org/users/eparis/audit.git
 S:      Maintained
 F:      include/linux/audit.h
 F:      include/uapi/linux/audit.h
@@ -1935,7 +1961,8 @@ S:	Maintained
 F:      drivers/gpio/gpio-bt8xx.c
 
 BTRFS FILE SYSTEM
-M:      Chris Mason <chris.mason@fusionio.com>
+M:      Chris Mason <clm@fb.com>
+M:      Josef Bacik <jbacik@fb.com>
 L:      linux-btrfs@vger.kernel.org
 W:      http://btrfs.wiki.kernel.org/
 Q:      http://patchwork.kernel.org/project/linux-btrfs/list/
@@ -2024,6 +2051,7 @@ L:	linux-can@vger.kernel.org
 W:      http://gitorious.org/linux-can
 T:      git git://gitorious.org/linux-can/linux-can-next.git
 S:      Maintained
+F:      Documentation/networking/can.txt
 F:      net/can/
 F:      include/linux/can/core.h
 F:      include/uapi/linux/can.h
@@ -2138,7 +2166,8 @@ S:	Maintained
 F:      Documentation/zh_CN/
 
 CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
-M:      Alexander Shishkin <alexander.shishkin@linux.intel.com>
+M:      Peter Chen <Peter.Chen@freescale.com>
+T:      git://github.com/hzpeterchen/linux-usb.git
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 F:      drivers/usb/chipidea/
@@ -2157,6 +2186,11 @@ M:	Nishank Trivedi <nistrive@cisco.com>
 S:      Supported
 F:      drivers/net/ethernet/cisco/enic/
 
+CISCO VIC LOW LATENCY NIC DRIVER
+M:      Upinder Malhi <umalhi@cisco.com>
+S:      Supported
+F:      drivers/infiniband/hw/usnic
+
 CIRRUS LOGIC EP93XX ETHERNET DRIVER
 M:      Hartley Sweeten <hsweeten@visionengravers.com>
 L:      netdev@vger.kernel.org
@@ -2618,7 +2652,7 @@ S:	Maintained
 F:      drivers/platform/x86/dell-laptop.c
 
 DELL LAPTOP SMM DRIVER
-S:      Orphan
+M:      Guenter Roeck <linux@roeck-us.net>
 F:      drivers/char/i8k.c
 F:      include/uapi/linux/i8k.h
 
@@ -2637,7 +2671,7 @@ DESIGNWARE USB2 DRD IP DRIVER
 M:      Paul Zimmerman <paulz@synopsys.com>
 L:      linux-usb@vger.kernel.org
 S:      Maintained
-F:      drivers/staging/dwc2/
+F:      drivers/usb/dwc2/
 
 DESIGNWARE USB3 DRD IP DRIVER
 M:      Felipe Balbi <balbi@ti.com>
@@ -2827,8 +2861,10 @@ F:	include/uapi/drm/
 
 INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
 M:      Daniel Vetter <daniel.vetter@ffwll.ch>
+M:      Jani Nikula <jani.nikula@linux.intel.com>
 L:      intel-gfx@lists.freedesktop.org
 L:      dri-devel@lists.freedesktop.org
+Q:      http://patchwork.freedesktop.org/project/intel-gfx/
 T:      git git://people.freedesktop.org/~danvet/drm-intel
 S:      Supported
 F:      drivers/gpu/drm/i915/
@@ -3332,6 +3368,7 @@ EXTERNAL CONNECTOR SUBSYSTEM (EXTCON)
 M:      MyungJoo Ham <myungjoo.ham@samsung.com>
 M:      Chanwoo Choi <cw00.choi@samsung.com>
 L:      linux-kernel@vger.kernel.org
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git
 S:      Maintained
 F:      drivers/extcon/
 F:      Documentation/extcon/
@@ -3341,7 +3378,6 @@ M:	Jingoo Han <jg1.han@samsung.com>
 L:      linux-fbdev@vger.kernel.org
 S:      Maintained
 F:      drivers/video/exynos/exynos_dp*
-F:      include/video/exynos_dp*
 
 EXYNOS MIPI DISPLAY DRIVERS
 M:      Inki Dae <inki.dae@samsung.com>
@@ -3631,6 +3667,7 @@ W:	http://en.wikipedia.org/wiki/F2FS
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git
 S:      Maintained
 F:      Documentation/filesystems/f2fs.txt
+F:      Documentation/ABI/testing/sysfs-fs-f2fs
 F:      fs/f2fs/
 F:      include/linux/f2fs_fs.h
 
@@ -3765,9 +3802,11 @@ F:	include/uapi/linux/gigaset_dev.h
 
 GPIO SUBSYSTEM
 M:      Linus Walleij <linus.walleij@linaro.org>
-S:      Maintained
+M:      Alexandre Courbot <gnurou@gmail.com>
 L:      linux-gpio@vger.kernel.org
-F:      Documentation/gpio.txt
+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/asm-generic/gpio.h
@@ -3835,6 +3874,12 @@ T:	git git://linuxtv.org/media_tree.git
 S:      Maintained
 F:      drivers/media/usb/gspca/
 
+GUID PARTITION TABLE (GPT)
+M:      Davidlohr Bueso <davidlohr@hp.com>
+L:      linux-efi@vger.kernel.org
+S:      Maintained
+F:      block/partitions/efi.*
+
 STK1160 USB VIDEO CAPTURE DRIVER
 M:      Ezequiel Garcia <elezegarcia@gmail.com>
 L:      linux-media@vger.kernel.org
@@ -3943,6 +3988,12 @@ S:	Orphan
 F:      Documentation/filesystems/hfs.txt
 F:      fs/hfs/
 
+HFSPLUS FILESYSTEM
+L:      linux-fsdevel@vger.kernel.org
+S:      Orphan
+F:      Documentation/filesystems/hfsplus.txt
+F:      fs/hfsplus/
+
 HGA FRAMEBUFFER DRIVER
 M:      Ferenc Bakonyi <fero@drama.obuda.kando.hu>
 L:      linux-nvidia@lists.surfsouth.com
@@ -4044,12 +4095,26 @@ W:	http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
 S:      Maintained
 F:      fs/hpfs/
 
+HSI SUBSYSTEM
+M:      Sebastian Reichel <sre@debian.org>
+S:      Maintained
+F:      Documentation/ABI/testing/sysfs-bus-hsi
+F:      drivers/hsi/
+F:      include/linux/hsi/
+F:      include/uapi/linux/hsi/
+
 HSO 3G MODEM DRIVER
 M:      Jan Dumon <j.dumon@option.com>
 W:      http://www.pharscape.org
 S:      Maintained
 F:      drivers/net/usb/hso.c
 
+HSR NETWORK PROTOCOL
+M:      Arvid Brodin <arvid.brodin@alten.se>
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      net/hsr/
+
 HTCPEN TOUCHSCREEN DRIVER
 M:      Pau Oliva Fora <pof@eslack.org>
 L:      linux-input@vger.kernel.org
@@ -4449,17 +4514,16 @@ M:	Deepak Saxena <dsaxena@plexity.net>
 S:      Maintained
 F:      drivers/char/hw_random/ixp4xx-rng.c
 
-INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e)
+INTEL ETHERNET DRIVERS (e100/e1000/e1000e/igb/igbvf/ixgb/ixgbe/ixgbevf/i40e/i40evf)
 M:      Jeff Kirsher <jeffrey.t.kirsher@intel.com>
 M:      Jesse Brandeburg <jesse.brandeburg@intel.com>
 M:      Bruce Allan <bruce.w.allan@intel.com>
 M:      Carolyn Wyborny <carolyn.wyborny@intel.com>
 M:      Don Skidmore <donald.c.skidmore@intel.com>
 M:      Greg Rose <gregory.v.rose@intel.com>
-M:      Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
 M:      Alex Duyck <alexander.h.duyck@intel.com>
 M:      John Ronciak <john.ronciak@intel.com>
-M:      Tushar Dave <tushar.n.dave@intel.com>
+M:      Mitch Williams <mitch.a.williams@intel.com>
 L:      e1000-devel@lists.sourceforge.net
 W:      http://www.intel.com/support/feedback.htm
 W:      http://e1000.sourceforge.net/
@@ -4475,6 +4539,7 @@ F:	Documentation/networking/ixgb.txt
 F:      Documentation/networking/ixgbe.txt
 F:      Documentation/networking/ixgbevf.txt
 F:      Documentation/networking/i40e.txt
+F:      Documentation/networking/i40evf.txt
 F:      drivers/net/ethernet/intel/
 
 INTEL-MID GPIO DRIVER
@@ -4892,7 +4957,7 @@ F:	include/linux/sunrpc/
 F:      include/uapi/linux/sunrpc/
 
 KERNEL VIRTUAL MACHINE (KVM)
-M:      Gleb Natapov <gleb@redhat.com>
+M:      Gleb Natapov <gleb@kernel.org>
 M:      Paolo Bonzini <pbonzini@redhat.com>
 L:      kvm@vger.kernel.org
 W:      http://www.linux-kvm.org
@@ -5118,6 +5183,11 @@ F:	drivers/lguest/
 F:      include/linux/lguest*.h
 F:      tools/lguest/
 
+LIBLOCKDEP
+M:      Sasha Levin <sasha.levin@oracle.com>
+S:      Maintained
+F:      tools/lib/lockdep/
+
 LINUX FOR IBM pSERIES (RS/6000)
 M:      Paul Mackerras <paulus@au.ibm.com>
 W:      http://www.ibm.com/linux/ltc/projects/ppc
@@ -5262,7 +5332,7 @@ S:	Maintained
 F:      Documentation/lockdep*.txt
 F:      Documentation/lockstat.txt
 F:      include/linux/lockdep.h
-F:      kernel/lockdep*
+F:      kernel/locking/
 
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP/Vista Dynamic Disks)
 M:      "Richard Russon (FlatCap)" <ldm@flatcap.org>
@@ -5903,12 +5973,21 @@ M:	Steffen Klassert <steffen.klassert@secunet.com>
 M:      Herbert Xu <herbert@gondor.apana.org.au>
 M:      "David S. Miller" <davem@davemloft.net>
 L:      netdev@vger.kernel.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
+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/xfrm/
 F:      net/key/
 F:      net/ipv4/xfrm*
+F:      net/ipv4/esp4.c
+F:      net/ipv4/ah4.c
+F:      net/ipv4/ipcomp.c
+F:      net/ipv4/ip_vti.c
 F:      net/ipv6/xfrm*
+F:      net/ipv6/esp6.c
+F:      net/ipv6/ah6.c
+F:      net/ipv6/ipcomp6.c
+F:      net/ipv6/ip6_vti.c
 F:      include/uapi/linux/xfrm.h
 F:      include/net/xfrm.h
 
@@ -5974,10 +6053,10 @@ F:	drivers/nfc/
 F:      include/linux/platform_data/pn544.h
 
 NFS, SUNRPC, AND LOCKD CLIENTS
-M:      Trond Myklebust <Trond.Myklebust@netapp.com>
+M:      Trond Myklebust <trond.myklebust@primarydata.com>
 L:      linux-nfs@vger.kernel.org
 W:      http://client.linux-nfs.org
-T:      git git://git.linux-nfs.org/pub/linux/nfs-2.6.git
+T:      git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
 S:      Maintained
 F:      fs/lockd/
 F:      fs/nfs/
@@ -6229,7 +6308,7 @@ F:	drivers/i2c/busses/i2c-ocores.c
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE
 M:      Grant Likely <grant.likely@linaro.org>
-M:      Rob Herring <rob.herring@calxeda.com>
+M:      Rob Herring <robh+dt@kernel.org>
 L:      devicetree@vger.kernel.org
 W:      http://fdt.secretlab.ca
 T:      git git://git.secretlab.ca/git/linux-2.6.git
@@ -6241,11 +6320,11 @@ K:	of_get_property
 K:      of_match_table
 
 OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
-M:      Rob Herring <rob.herring@calxeda.com>
+M:      Rob Herring <robh+dt@kernel.org>
 M:      Pawel Moll <pawel.moll@arm.com>
 M:      Mark Rutland <mark.rutland@arm.com>
-M:      Stephen Warren <swarren@wwwdotorg.org>
 M:      Ian Campbell <ijc+devicetree@hellion.org.uk>
+M:      Kumar Gala <galak@codeaurora.org>
 L:      devicetree@vger.kernel.org
 S:      Maintained
 F:      Documentation/devicetree/
@@ -6455,19 +6534,52 @@ F:	drivers/pci/
 F:      include/linux/pci*
 F:      arch/x86/pci/
 
+PCI DRIVER FOR IMX6
+M:      Richard Zhu <r65037@freescale.com>
+M:      Shawn Guo <shawn.guo@linaro.org>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/pci/host/*imx6*
+
+PCI DRIVER FOR MVEBU (Marvell Armada 370 and Armada XP SOC support)
+M:      Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+M:      Jason Cooper <jason@lakedaemon.net>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/pci/host/*mvebu*
+
 PCI DRIVER FOR NVIDIA TEGRA
 M:      Thierry Reding <thierry.reding@gmail.com>
 L:      linux-tegra@vger.kernel.org
+L:      linux-pci@vger.kernel.org
 S:      Supported
 F:      Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt
 F:      drivers/pci/host/pci-tegra.c
 
+PCI DRIVER FOR RENESAS R-CAR
+M:      Simon Horman <horms@verge.net.au>
+L:      linux-pci@vger.kernel.org
+L:      linux-sh@vger.kernel.org
+S:      Maintained
+F:      drivers/pci/host/*rcar*
+
 PCI DRIVER FOR SAMSUNG EXYNOS
 M:      Jingoo Han <jg1.han@samsung.com>
 L:      linux-pci@vger.kernel.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/pci/host/pci-exynos.c
 
+PCI DRIVER FOR SYNOPSIS DESIGNWARE
+M:      Mohit Kumar <mohit.kumar@st.com>
+M:      Jingoo Han <jg1.han@samsung.com>
+L:      linux-pci@vger.kernel.org
+S:      Maintained
+F:      drivers/pci/host/*designware*
+
 PCMCIA SUBSYSTEM
 P:      Linux PCMCIA Team
 L:      linux-pcmcia@lists.infradead.org
@@ -6641,7 +6753,7 @@ F:	include/linux/timer*
 F:      kernel/*timer*
 
 POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
-M:      Anton Vorontsov <anton@enomsg.org>
+M:      Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 M:      David Woodhouse <dwmw2@infradead.org>
 T:      git git://git.infradead.org/battery-2.6.git
 S:      Maintained
@@ -6860,8 +6972,7 @@ S:	Maintained
 F:      drivers/scsi/qla1280.[ch]
 
 QLOGIC QLA2XXX FC-SCSI DRIVER
-M:      Andrew Vasquez <andrew.vasquez@qlogic.com>
-M:      linux-driver@qlogic.com
+M:      qla2xxx-upstream@qlogic.com
 L:      linux-scsi@vger.kernel.org
 S:      Supported
 F:      Documentation/scsi/LICENSE.qla2xxx
@@ -6923,6 +7034,14 @@ T:	git git://linuxtv.org/anttip/media_tree.git
 S:      Maintained
 F:      drivers/media/tuners/qt1010*
 
+QUALCOMM ATHEROS ATH9K WIRELESS DRIVER
+M:      QCA ath9k Development <ath9k-devel@qca.qualcomm.com>
+L:      linux-wireless@vger.kernel.org
+L:      ath9k-devel@lists.ath9k.org
+W:      http://wireless.kernel.org/en/users/Drivers/ath9k
+S:      Supported
+F:      drivers/net/wireless/ath/ath9k/
+
 QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 M:      Kalle Valo <kvalo@qca.qualcomm.com>
 L:      ath10k@lists.infradead.org
@@ -7034,6 +7153,12 @@ 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
 
+RCUTORTURE TEST FRAMEWORK
+M:      "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+S:      Supported
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
+F:      tools/testing/selftests/rcutorture
+
 RDC R-321X SoC
 M:      Florian Fainelli <florian@openwrt.org>
 S:      Maintained
@@ -7332,6 +7457,12 @@ L:	linux-media@vger.kernel.org
 S:      Supported
 F:      drivers/media/i2c/s5c73m3/*
 
+SAMSUNG SOC CLOCK DRIVERS
+M:      Tomasz Figa <t.figa@samsung.com>
+S:      Supported
+L:      linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+F:      drivers/clk/samsung/
+
 SERIAL DRIVERS
 M:      Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 L:      linux-serial@vger.kernel.org
@@ -7386,7 +7517,6 @@ S:	Maintained
 F:      kernel/sched/
 F:      include/linux/sched.h
 F:      include/uapi/linux/sched.h
-F:      kernel/wait.c
 F:      include/linux/wait.h
 
 SCORE ARCHITECTURE
@@ -7404,7 +7534,7 @@ S:	Maintained
 F:      drivers/scsi/sr*
 
 SCSI RDMA PROTOCOL (SRP) INITIATOR
-M:      David Dillow <dillowda@ornl.gov>
+M:      Bart Van Assche <bvanassche@acm.org>
 L:      linux-rdma@vger.kernel.org
 S:      Supported
 W:      http://www.openfabrics.org
@@ -7416,8 +7546,9 @@ F:	include/scsi/srp.h
 SCSI SG DRIVER
 M:      Doug Gilbert <dgilbert@interlog.com>
 L:      linux-scsi@vger.kernel.org
-W:      http://www.torque.net/sg
+W:      http://sg.danny.cz/sg
 S:      Maintained
+F:      Documentation/scsi/scsi-generic.txt
 F:      drivers/scsi/sg.c
 F:      include/scsi/sg.h
 
@@ -7572,7 +7703,7 @@ F:	drivers/net/ethernet/emulex/benet/
 
 SFC NETWORK DRIVER
 M:      Solarflare linux maintainers <linux-net-drivers@solarflare.com>
-M:      Ben Hutchings <bhutchings@solarflare.com>
+M:      Shradha Shah <sshah@solarflare.com>
 L:      netdev@vger.kernel.org
 S:      Supported
 F:      drivers/net/ethernet/sfc/
@@ -8497,6 +8628,7 @@ S:      Supported
 F:      drivers/thermal/
 F:      include/linux/thermal.h
 F:      include/linux/cpu_cooling.h
+F:      Documentation/devicetree/bindings/thermal/
 
 THINGM BLINK(1) USB RGB LED DRIVER
 M:      Vivien Didelot <vivien.didelot@savoirfairelinux.com>
@@ -8564,12 +8696,11 @@ S:	Maintained
 F:      sound/soc/codecs/twl4030*
 
 TI WILINK WIRELESS DRIVERS
-M:      Luciano Coelho <luca@coelho.fi>
 L:      linux-wireless@vger.kernel.org
 W:      http://wireless.kernel.org/en/users/Drivers/wl12xx
 W:      http://wireless.kernel.org/en/users/Drivers/wl1251
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
-S:      Maintained
+S:      Orphan
 F:      drivers/net/wireless/ti/
 F:      include/linux/wl12xx.h
 
@@ -8669,14 +8800,10 @@ S:	Odd fixes
 F:      drivers/media/usb/tm6000/
 
 TPM DEVICE DRIVER
-M:      Leonidas Da Silva Barbosa <leosilva@linux.vnet.ibm.com>
-M:      Ashley Lai <ashley@ashleylai.com>
 M:      Peter Huewe <peterhuewe@gmx.de>
-M:      Rajiv Andrade <mail@srajiv.net>
-W:      http://tpmdd.sourceforge.net
+M:      Ashley Lai <ashley@ashleylai.com>
 M:      Marcel Selhorst <tpmdd@selhorst.net>
-M:      Sirrix AG <tpmdd@sirrix.com>
-W:      http://www.sirrix.com
+W:      http://tpmdd.sourceforge.net
 L:      tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 S:      Maintained
 F:      drivers/char/tpm/
@@ -9166,6 +9293,7 @@ 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
@@ -9175,6 +9303,7 @@ 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/
@@ -9187,6 +9316,7 @@ 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
@@ -9484,6 +9614,7 @@ M:	Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 M:      Boris Ostrovsky <boris.ostrovsky@oracle.com>
 M:      David Vrabel <david.vrabel@citrix.com>
 L:      xen-devel@lists.xenproject.org (moderated for non-subscribers)
+T:      git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git
 S:      Supported
 F:      arch/x86/xen/
 F:      drivers/*/xen-*front.c
@@ -9530,7 +9661,7 @@ F:	drivers/xen/*swiotlb*
 
 XFS FILESYSTEM
 P:      Silicon Graphics Inc
-M:      Dave Chinner <dchinner@fromorbit.com>
+M:      Dave Chinner <david@fromorbit.com>
 M:      Ben Myers <bpm@sgi.com>
 M:      xfs@oss.sgi.com
 L:      xfs@oss.sgi.com