Merge branch 'mymd/for-next' into mymd/for-linus

diff --combined MAINTAINERS
index 24c5b9a,fc1d1a5..eef506a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -781,7 -781,6 +781,7 @@@ F: sound/aoa
  APM DRIVER
  M:    Jiri Kosina <jikos@kernel.org>
  S:    Odd fixes
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git
  F:    arch/x86/kernel/apm_32.c
  F:    include/linux/apm_bios.h
  F:    include/uapi/linux/apm_bios.h
@@@ -947,7 -946,6 +947,7 @@@ M: Alexandre Belloni <alexandre.belloni
  M:    Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.linux4sam.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
  S:    Supported
  F:    arch/arm/mach-at91/
  F:    include/soc/at91/
@@@ -967,8 -965,6 +967,8 @@@ M: Rob Herring <robh@kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-highbank/
 +F:    arch/arm/boot/dts/highbank.dts
 +F:    arch/arm/boot/dts/ecx-*.dts*
  
  ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT
  M:    Krzysztof Halasa <khalasa@piap.pl>
@@@ -1044,7 -1040,6 +1044,7 @@@ M:      Barry Song <baohua@kernel.org
  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/boot/dts/prima2*
  F:    arch/arm/mach-prima2/
  F:    drivers/clk/sirf/
  F:    drivers/clocksource/timer-prima2.c
@@@ -1146,10 -1141,6 +1146,10 @@@ W:    http://www.hisilicon.co
  S:    Supported
  T:    git git://github.com/hisilicon/linux-hisi.git
  F:    arch/arm/mach-hisi/
 +F:    arch/arm/boot/dts/hi3*
 +F:    arch/arm/boot/dts/hip*
 +F:    arch/arm/boot/dts/hisi*
 +F:    arch/arm64/boot/dts/hisilicon/
  
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  M:    Kristoffer Ericson <kristoffer.ericson@gmail.com>
@@@ -1226,7 -1217,6 +1226,7 @@@ M:      Santosh Shilimkar <ssantosh@kernel.o
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-keystone/
 +F:    arch/arm/boot/dts/k2*
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git
  
  ARM/TEXAS INSTRUMENT KEYSTONE CLOCK FRAMEWORK
@@@ -1295,7 -1285,6 +1295,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-berlin/
  F:    arch/arm/boot/dts/berlin*
 +F:    arch/arm64/boot/dts/marvell/berlin*
  
  
  ARM/Marvell Dove/MV78xx0/Orion SOC support
@@@ -1426,37 -1415,26 +1426,37 @@@ W:   http://www.arm.linux.org.uk
  S:    Maintained
  
  ARM/QUALCOMM SUPPORT
 -M:    Kumar Gala <galak@codeaurora.org>
 -M:    Andy Gross <agross@codeaurora.org>
 -M:    David Brown <davidb@codeaurora.org>
 +M:    Andy Gross <andy.gross@linaro.org>
 +M:    David Brown <david.brown@linaro.org>
  L:    linux-arm-msm@vger.kernel.org
  L:    linux-soc@vger.kernel.org
  S:    Maintained
 +F:    arch/arm/boot/dts/qcom-*.dts
 +F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
 +F:    arch/arm64/boot/dts/qcom/*
  F:    drivers/soc/qcom/
  F:    drivers/tty/serial/msm_serial.h
  F:    drivers/tty/serial/msm_serial.c
  F:    drivers/*/pm8???-*
  F:    drivers/mfd/ssbi.c
  F:    drivers/firmware/qcom_scm.c
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git
  
  ARM/RADISYS ENP2611 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/RENESAS ARM64 ARCHITECTURE
 +M:    Simon Horman <horms@verge.net.au>
 +M:    Magnus Damm <magnus.damm@gmail.com>
 +L:    linux-sh@vger.kernel.org
 +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/arm64/boot/dts/renesas/
 +
  ARM/RISCPC ARCHITECTURE
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1476,7 -1454,6 +1476,7 @@@ ARM/Rockchip SoC suppor
  M:    Heiko Stuebner <heiko@sntech.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-rockchip@lists.infradead.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
  S:    Maintained
  F:    arch/arm/boot/dts/rk3*
  F:    arch/arm/mach-rockchip/
@@@ -1494,8 -1471,6 +1494,8 @@@ L:      linux-arm-kernel@lists.infradead.or
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/s3c*
 +F:    arch/arm/boot/dts/s5p*
 +F:    arch/arm/boot/dts/samsung*
  F:    arch/arm/boot/dts/exynos*
  F:    arch/arm64/boot/dts/exynos/
  F:    arch/arm/plat-samsung/
@@@ -1556,8 -1531,9 +1556,8 @@@ F:      drivers/media/platform/s5p-jpeg
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Simon Horman <horms@verge.net.au>
  M:    Magnus Damm <magnus.damm@gmail.com>
 -L:    linux-sh@vger.kernel.org
 -W:    http://oss.renesas.com
 -Q:    http://patchwork.kernel.org/project/linux-sh/list/
 +L:    linux-renesas-soc@vger.kernel.org
 +Q:    http://patchwork.kernel.org/project/linux-renesas-soc/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git next
  S:    Supported
  F:    arch/arm/boot/dts/emev2*
@@@ -1575,7 -1551,6 +1575,7 @@@ S:      Maintaine
  F:    arch/arm/mach-socfpga/
  F:    arch/arm/boot/dts/socfpga*
  F:    arch/arm/configs/socfpga_defconfig
 +F:    arch/arm64/boot/dts/altera/
  W:    http://www.rocketboards.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
  
@@@ -1628,13 -1603,6 +1628,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  N:    stm32
  F:    drivers/clocksource/armv7m_systick.c
  
 +ARM/TANGO ARCHITECTURE
 +M:    Marc Gonzalez <marc_gonzalez@sigmadesigns.com>
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    arch/arm/mach-tango/
 +F:    arch/arm/boot/dts/tango*
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1689,8 -1657,6 +1689,8 @@@ F:      arch/arm/boot/dts/uniphier
  F:    arch/arm/include/asm/hardware/cache-uniphier.h
  F:    arch/arm/mach-uniphier/
  F:    arch/arm/mm/cache-uniphier.c
 +F:    arch/arm64/boot/dts/socionext/
 +F:    drivers/bus/uniphier-system-bus.c
  F:    drivers/i2c/busses/i2c-uniphier*
  F:    drivers/pinctrl/uniphier/
  F:    drivers/tty/serial/8250/8250_uniphier.c
@@@ -1729,7 -1695,7 +1729,7 @@@ M:      Lorenzo Pieralisi <lorenzo.pieralisi
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/boot/dts/vexpress*
 -F:    arch/arm64/boot/dts/arm/vexpress*
 +F:    arch/arm64/boot/dts/arm/
  F:    arch/arm/mach-vexpress/
  F:    */*/vexpress*
  F:    */*/*/vexpress*
@@@ -1812,7 -1778,6 +1812,7 @@@ ARM64 PORT (AARCH64 ARCHITECTURE
  M:    Catalin Marinas <catalin.marinas@arm.com>
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
  S:    Maintained
  F:    arch/arm64/
  F:    Documentation/arm64/
@@@ -1841,12 -1806,6 +1841,12 @@@ S:    Maintaine
  F:    drivers/platform/x86/asus*.c
  F:    drivers/platform/x86/eeepc*.c
  
 +ASUS WIRELESS RADIO CONTROL DRIVER
 +M:    João Paulo Rechi Vita <jprvita@gmail.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/asus-wireless.c
 +
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  R:    Dan Williams <dan.j.williams@intel.com>
  W:    http://sourceforge.net/projects/xscaleiop
@@@ -1898,7 -1857,7 +1898,7 @@@ ATHEROS ATH6KL WIRELESS DRIVE
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath6kl
 -T:    git git://github.com/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath6kl/
  
@@@ -2150,7 -2109,6 +2150,7 @@@ F:      drivers/net/wireless/broadcom/b43leg
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Jingoo Han <jingoohan1@gmail.com>
  M:    Lee Jones <lee.jones@linaro.org>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
  S:    Maintained
  F:    drivers/video/backlight/
  F:    include/linux/backlight.h
@@@ -2356,7 -2314,6 +2356,7 @@@ 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/arm64/boot/dts/broadcom/
  F:    arch/arm/configs/bcm_defconfig
  F:    drivers/mmc/host/sdhci-bcm-kona.c
  F:    drivers/clocksource/bcm_kona_timer.c
@@@ -2414,7 -2371,6 +2414,7 @@@ M:      Brian Norris <computersforpeace@gmai
  M:    Gregory Fong <gregory.0xf0@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/*brcmstb*
@@@ -2434,8 -2390,6 +2434,8 @@@ F:      arch/mips/kernel/*bmips
  F:    arch/mips/boot/dts/brcm/bcm*.dts*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
 +F:    include/linux/bcm963xx_nvram.h
 +F:    include/linux/bcm963xx_tag.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Prashant Sreedharan <prashant@broadcom.com>
@@@ -2490,7 -2444,7 +2490,7 @@@ N:      bcm8831
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Gregory Fong <gregory.0xf0@gmail.com>
 -L:    bcm-kernel-feedback-list@broadcom.com>
 +L:    bcm-kernel-feedback-list@broadcom.com
  S:    Supported
  F:    drivers/gpio/gpio-brcmstb.c
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
@@@ -2752,11 -2706,10 +2752,11 @@@ F:   fs/ceph
  CERTIFICATE HANDLING:
  M:    David Howells <dhowells@redhat.com>
  M:    David Woodhouse <dwmw2@infradead.org>
 -L:    keyrings@linux-nfs.org
 +L:    keyrings@vger.kernel.org
  S:    Maintained
  F:    Documentation/module-signing.txt
  F:    certs/
 +F:    scripts/sign-file.c
  F:    scripts/extract-cert.c
  
  CERTIFIED WIRELESS USB (WUSB) SUBSYSTEM:
@@@ -2836,7 -2789,6 +2836,7 @@@ F:      drivers/input/touchscreen/chipone_ic
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Olof Johansson <olof@lixom.net>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
  F:    drivers/platform/chrome/
  
  CISCO VIC ETHERNET NIC DRIVER
@@@ -3135,7 -3087,6 +3135,7 @@@ M:      Mikael Starvik <starvik@axis.com
  M:    Jesper Nilsson <jesper.nilsson@axis.com>
  L:    linux-cris-kernel@axis.com
  W:    http://developer.axis.com
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
  S:    Maintained
  F:    arch/cris/
  F:    drivers/tty/serial/crisv10.*
@@@ -3144,7 -3095,6 +3144,7 @@@ CRYPTO AP
  M:    Herbert Xu <herbert@gondor.apana.org.au>
  M:    "David S. Miller" <davem@davemloft.net>
  L:    linux-crypto@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
  S:    Maintained
  F:    Documentation/crypto/
@@@ -3477,21 -3427,8 +3477,21 @@@ DEVICE FREQUENCY (DEVFREQ
  M:    MyungJoo Ham <myungjoo.ham@samsung.com>
  M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-pm@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
  S:    Maintained
  F:    drivers/devfreq/
 +F:    include/linux/devfreq.h
 +F:    Documentation/devicetree/bindings/devfreq/
 +
 +DEVICE FREQUENCY EVENT (DEVFREQ-EVENT)
 +M:    Chanwoo Choi <cw00.choi@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git
 +S:    Supported
 +F:    drivers/devfreq/event/
 +F:    drivers/devfreq/devfreq-event.c
 +F:    include/linux/devfreq-event.h
 +F:    Documentation/devicetree/bindings/devfreq/event/
  
  DEVICE NUMBER REGISTRY
  M:    Torben Mathiasen <device@lanana.org>
@@@ -3607,7 -3544,7 +3607,7 @@@ M:      Christine Caulfield <ccaulfie@redhat
  M:    David Teigland <teigland@redhat.com>
  L:    cluster-devel@redhat.com
  W:    http://sources.redhat.com/cluster/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
  S:    Supported
  F:    fs/dlm/
  
@@@ -3681,12 -3618,13 +3681,12 @@@ F:   drivers/scsi/dpt
  F:    drivers/scsi/dpt/
  
  DRBD DRIVER
 -P:    Philipp Reisner
 -P:    Lars Ellenberg
 -M:    drbd-dev@lists.linbit.com
 -L:    drbd-user@lists.linbit.com
 +M:    Philipp Reisner <philipp.reisner@linbit.com>
 +M:    Lars Ellenberg <lars.ellenberg@linbit.com>
 +L:    drbd-dev@lists.linbit.com
  W:    http://www.drbd.org
 -T:    git git://git.drbd.org/linux-2.6-drbd.git drbd
 -T:    git git://git.drbd.org/drbd-8.3.git
 +T:    git git://git.linbit.com/linux-drbd.git
 +T:    git git://git.linbit.com/drbd-8.4.git
  S:    Supported
  F:    drivers/block/drbd/
  F:    lib/lru_cache.c
@@@ -3807,7 -3745,7 +3807,7 @@@ F:      Documentation/devicetree/bindings/di
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    dri-devel@lists.freedesktop.org
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  T:    git git://people.freedesktop.org/~airlied/linux
  S:    Supported
  F:    drivers/gpu/drm/rcar-du/
@@@ -4020,7 -3958,6 +4020,7 @@@ M:      Tyler Hicks <tyhicks@canonical.com
  L:    ecryptfs@vger.kernel.org
  W:    http://ecryptfs.org
  W:    https://launchpad.net/ecryptfs
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
  S:    Supported
  F:    Documentation/filesystems/ecryptfs.txt
  F:    fs/ecryptfs/
@@@ -4299,7 -4236,6 +4299,7 @@@ M:      Andreas Dilger <adilger.kernel@dilge
  L:    linux-ext4@vger.kernel.org
  W:    http://ext4.wiki.kernel.org
  Q:    http://patchwork.ozlabs.org/project/linux-ext4/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
  S:    Maintained
  F:    Documentation/filesystems/ext4.txt
  F:    fs/ext4/
@@@ -4663,7 -4599,8 +4663,7 @@@ F:      include/linux/f2fs_fs.
  F:    include/trace/events/f2fs.h
  
  FUJITSU FR-V (FRV) PORT
 -M:    David Howells <dhowells@redhat.com>
 -S:    Maintained
 +S:    Orphan
  F:    arch/frv/
  
  FUJITSU LAPTOP EXTRAS
@@@ -4982,7 -4919,6 +4982,7 @@@ F:      include/linux/hw_random.
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <ohad@wizery.com>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
  F:    Documentation/hwspinlock.txt
  F:    drivers/hwspinlock/hwspinlock_*
  F:    include/linux/hwspinlock.h
@@@ -5521,7 -5457,6 +5521,7 @@@ M:      Dmitry Kasatkin <dmitry.kasatkin@gma
  L:    linux-ima-devel@lists.sourceforge.net
  L:    linux-ima-user@lists.sourceforge.net
  L:    linux-security-module@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  S:    Supported
  F:    security/integrity/ima/
  
@@@ -5597,12 -5532,6 +5597,12 @@@ T:    git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
 +INTEL HID EVENT DRIVER
 +M:    Alex Hung <alex.hung@canonical.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    drivers/platform/x86/intel-hid.c
 +
  INTEL IDLE DRIVER
  M:    Len Brown <lenb@kernel.org>
  L:    linux-pm@vger.kernel.org
@@@ -5777,27 -5706,18 +5777,27 @@@ F:   include/linux/mic_bus.
  F:    include/linux/scif.h
  F:    include/uapi/linux/mic_common.h
  F:    include/uapi/linux/mic_ioctl.h
 -F     include/uapi/linux/scif_ioctl.h
 +F:    include/uapi/linux/scif_ioctl.h
  F:    drivers/misc/mic/
  F:    drivers/dma/mic_x100_dma.c
  F:    drivers/dma/mic_x100_dma.h
 -F     Documentation/mic/
 +F:    Documentation/mic/
  
 -INTEL PMC IPC DRIVER
 +INTEL PMC/P-Unit IPC DRIVER
  M:    Zha Qipeng<qipeng.zha@intel.com>
  L:    platform-driver-x86@vger.kernel.org
  S:    Maintained
  F:    drivers/platform/x86/intel_pmc_ipc.c
 +F:    drivers/platform/x86/intel_punit_ipc.c
  F:    arch/x86/include/asm/intel_pmc_ipc.h
 +F:    arch/x86/include/asm/intel_punit_ipc.h
 +
 +INTEL TELEMETRY DRIVER
 +M:    Souvik Kumar Chakravarty <souvik.k.chakravarty@intel.com>
 +L:    platform-driver-x86@vger.kernel.org
 +S:    Maintained
 +F:    arch/x86/include/asm/intel_telemetry.h
 +F:    drivers/platform/x86/intel_telemetry*
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
@@@ -5860,8 -5780,6 +5860,8 @@@ M:      Julian Anastasov <ja@ssi.bg
  L:    netdev@vger.kernel.org
  L:    lvs-devel@vger.kernel.org
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git
  F:    Documentation/networking/ipvs-sysctl.txt
  F:    include/net/ip_vs.h
  F:    include/uapi/linux/ip_vs.h
@@@ -6145,7 -6063,6 +6145,7 @@@ M:      "J. Bruce Fields" <bfields@fieldses.
  M:    Jeff Layton <jlayton@poochiereds.net>
  L:    linux-nfs@vger.kernel.org
  W:    http://nfs.sourceforge.net/
 +T:    git git://linux-nfs.org/~bfields/linux.git
  S:    Supported
  F:    fs/nfsd/
  F:    include/uapi/linux/nfsd/
@@@ -6202,7 -6119,6 +6202,7 @@@ M:      Christian Borntraeger <borntraeger@d
  M:    Cornelia Huck <cornelia.huck@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
  S:    Supported
  F:    Documentation/s390/kvm.txt
  F:    arch/s390/include/asm/kvm*
@@@ -6232,14 -6148,6 +6232,14 @@@ F:    arch/arm64/include/uapi/asm/kvm
  F:    arch/arm64/include/asm/kvm*
  F:    arch/arm64/kvm/
  
 +KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)
 +M:    James Hogan <james.hogan@imgtec.com>
 +L:    linux-mips@linux-mips.org
 +S:    Supported
 +F:    arch/mips/include/uapi/asm/kvm*
 +F:    arch/mips/include/asm/kvm*
 +F:    arch/mips/kvm/
 +
  KEXEC
  M:    Eric Biederman <ebiederm@xmission.com>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -6284,7 -6192,6 +6284,7 @@@ KGDB / KDB /debug_cor
  M:    Jason Wessel <jason.wessel@windriver.com>
  W:    http://kgdb.wiki.kernel.org/
  L:    kgdb-bugreport@lists.sourceforge.net
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
  S:    Maintained
  F:    Documentation/DocBook/kgdb.tmpl
  F:    drivers/misc/kgdbts.c
@@@ -6337,12 -6244,6 +6337,12 @@@ S:    Maintaine
  F:    net/l3mdev
  F:    include/net/l3mdev.h
  
 +LANTIQ MIPS ARCHITECTURE
 +M:    John Crispin <blogic@openwrt.org>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/lantiq
 +
  LAPB module
  L:    linux-x25@vger.kernel.org
  S:    Orphan
@@@ -6462,7 -6363,6 +6462,7 @@@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE S
  M:    Dan Williams <dan.j.williams@intel.com>
  L:    linux-nvdimm@lists.01.org
  Q:    https://patchwork.kernel.org/project/linux-nvdimm/list/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
  S:    Supported
  F:    drivers/nvdimm/*
  F:    include/linux/nd.h
@@@ -6958,7 -6858,7 +6958,7 @@@ F:      drivers/iio/potentiometer/mcp4531.
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
  F:    Documentation/devicetree/bindings/media/renesas,vsp1.txt
@@@ -7132,7 -7032,6 +7132,7 @@@ F:      Documentation/hwmon/menf21bm
  METAG ARCHITECTURE
  M:    James Hogan <james.hogan@imgtec.com>
  L:    linux-metag@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
  S:    Odd Fixes
  F:    arch/metag/
  F:    Documentation/metag/
@@@ -7179,45 -7078,27 +7179,45 @@@ W:   https://linuxtv.or
  S:    Odd Fixes
  F:    drivers/media/radio/radio-miropcm20*
  
 -Mellanox MLX5 core VPI driver
 -M:    Eli Cohen <eli@mellanox.com>
 +MELLANOX MLX4 core VPI driver
 +M:    Yishai Hadas <yishaih@mellanox.com>
  L:    netdev@vger.kernel.org
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
 +S:    Supported
 +F:    drivers/net/ethernet/mellanox/mlx4/
 +F:    include/linux/mlx4/
 +
 +MELLANOX MLX4 IB driver
 +M:    Yishai Hadas <yishaih@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://openfabrics.org/~eli/connect-ib.git
 +S:    Supported
 +F:    drivers/infiniband/hw/mlx4/
 +F:    include/linux/mlx4/
 +
 +MELLANOX MLX5 core VPI driver
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.ozlabs.org/project/netdev/list/
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
  
 -Mellanox MLX5 IB driver
 -M:    Eli Cohen <eli@mellanox.com>
 +MELLANOX MLX5 IB driver
 +M:    Matan Barak <matanb@mellanox.com>
 +M:    Leon Romanovsky <leonro@mellanox.com>
  L:    linux-rdma@vger.kernel.org
  W:    http://www.mellanox.com
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git git://openfabrics.org/~eli/connect-ib.git
  S:    Supported
 -F:    include/linux/mlx5/
  F:    drivers/infiniband/hw/mlx5/
 +F:    include/linux/mlx5/
  
  MELEXIS MLX90614 DRIVER
  M:    Crt Mori <cmo@melexis.com>
@@@ -7632,8 -7513,7 +7632,8 @@@ NETWORKING DRIVERS (WIRELESS
  M:    Kalle Valo <kvalo@codeaurora.org>
  L:    linux-wireless@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-wireless/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
  S:    Maintained
  F:    drivers/net/wireless/
  
@@@ -7748,12 -7628,6 +7748,12 @@@ W:    https://github.com/jonmason/ntb/wik
  T:    git git://github.com/jonmason/ntb.git
  F:    drivers/ntb/hw/intel/
  
 +NTB AMD DRIVER
 +M:    Xiangliang Yu <Xiangliang.Yu@amd.com>
 +L:    linux-ntb@googlegroups.com
 +S:    Supported
 +F:    drivers/ntb/hw/amd/
 +
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <anton@tuxera.com>
  L:    linux-ntfs-dev@lists.sourceforge.net
@@@ -8045,7 -7919,6 +8045,7 @@@ M:      Mark Rutland <mark.rutland@arm.com
  M:    Ian Campbell <ijc+devicetree@hellion.org.uk>
  M:    Kumar Gala <galak@codeaurora.org>
  L:    devicetree@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  S:    Maintained
  F:    Documentation/devicetree/
  F:    arch/*/boot/dts/
@@@ -8362,7 -8235,7 +8362,7 @@@ F:      drivers/pci/host/pci-dra7xx.
  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
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/pci/host/*rcar*
  
@@@ -8389,12 -8262,6 +8389,12 @@@ S:    Maintaine
  F:    Documentation/devicetree/bindings/pci/host-generic-pci.txt
  F:    drivers/pci/host/pci-host-generic.c
  
 +PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
 +M:    Keith Busch <keith.busch@intel.com>
 +L:    linux-pci@vger.kernel.org
 +S:    Supported
 +F:    arch/x86/pci/vmd.c
 +
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <pratyush.anand@gmail.com>
  L:    linux-pci@vger.kernel.org
@@@ -8419,24 -8286,16 +8419,24 @@@ F:   drivers/pci/host/pci-xgene-msi.
  
  PCIE DRIVER FOR HISILICON
  M:    Zhou Wang <wangzhou1@hisilicon.com>
 +M:    Gabriele Paoloni <gabriele.paoloni@huawei.com>
  L:    linux-pci@vger.kernel.org
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
  F:    drivers/pci/host/pcie-hisi.c
  
 +PCIE DRIVER FOR QUALCOMM MSM
 +M:     Stanimir Varbanov <svarbanov@mm-sol.com>
 +L:     linux-pci@vger.kernel.org
 +L:     linux-arm-msm@vger.kernel.org
 +S:     Maintained
 +F:     drivers/pci/host/*qcom*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    linux-pcmcia@lists.infradead.org
  W:    http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
  S:    Maintained
  F:    Documentation/pcmcia/
  F:    drivers/pcmcia/
@@@ -8554,7 -8413,7 +8554,7 @@@ F:      drivers/pinctrl/intel
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  M:    Geert Uytterhoeven <geert+renesas@glider.be>
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -8758,7 -8617,7 +8758,7 @@@ M:      Colin Cross <ccross@android.com
  M:    Kees Cook <keescook@chromium.org>
  M:    Tony Luck <tony.luck@intel.com>
  S:    Maintained
 -T:    git git://git.infradead.org/users/cbou/linux-pstore.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
  F:    fs/pstore/
  F:    include/linux/pstore*
  F:    drivers/firmware/efi/efi-pstore.c
@@@ -8832,7 -8691,6 +8832,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://github.com/rjarzmik/linux.git
  S:    Maintained
 +F:    arch/arm/boot/dts/pxa*
  F:    arch/arm/mach-pxa/
  F:    drivers/dma/pxa*
  F:    drivers/pcmcia/pxa2xx*
@@@ -8862,7 -8720,6 +8862,7 @@@ L:      linux-arm-kernel@lists.infradead.or
  T:    git git://github.com/hzhuang1/linux.git
  T:    git git://git.linaro.org/people/ycmiao/pxa-linux.git
  S:    Maintained
 +F:    arch/arm/boot/dts/mmp*
  F:    arch/arm/mach-mmp/
  
  PXA MMCI DRIVER
@@@ -8969,14 -8826,13 +8969,14 @@@ QUALCOMM ATHEROS ATH10K WIRELESS DRIVE
  M:    Kalle Valo <kvalo@qca.qualcomm.com>
  L:    ath10k@lists.infradead.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath10k
 -T:    git git://github.com/kvalo/ath.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  S:    Supported
  F:    drivers/net/wireless/ath/ath10k/
  
  QUALCOMM HEXAGON ARCHITECTURE
  M:    Richard Kuo <rkuo@codeaurora.org>
  L:    linux-hexagon@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git
  S:    Supported
  F:    arch/hexagon/
  
@@@ -9029,12 -8885,6 +9029,12 @@@ L:    linux-fbdev@vger.kernel.or
  S:    Maintained
  F:    drivers/video/fbdev/aty/aty128fb.c
  
 +RALINK MIPS ARCHITECTURE
 +M:    John Crispin <blogic@openwrt.org>
 +L:    linux-mips@linux-mips.org
 +S:    Maintained
 +F:    arch/mips/ralink
 +
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
@@@ -9169,19 -9019,18 +9169,19 @@@ F:   include/linux/rpmsg.
  RENESAS ETHERNET DRIVERS
  R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
  L:    netdev@vger.kernel.org
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  F:    drivers/net/ethernet/renesas/
  F:    include/linux/sh_eth.h
  
  RENESAS USB2 PHY DRIVER
  M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/phy/phy-rcar-gen3-usb2.c
  
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <p.zabel@pengutronix.de>
 +T:    git git://git.pengutronix.de/git/pza/linux
  S:    Maintained
  F:    drivers/reset/
  F:    Documentation/devicetree/bindings/reset/
@@@ -9329,7 -9178,6 +9329,7 @@@ M:      Martin Schwidefsky <schwidefsky@de.i
  M:    Heiko Carstens <heiko.carstens@de.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
  S:    Supported
  F:    arch/s390/
  F:    drivers/s390/
@@@ -9522,7 -9370,7 +9522,7 @@@ M:      Lukasz Majewski <l.majewski@samsung.
  L:    linux-pm@vger.kernel.org
  L:    linux-samsung-soc@vger.kernel.org
  S:    Supported
 -T:    https://github.com/lmajewski/linux-samsung-thermal.git
 +T:    git https://github.com/lmajewski/linux-samsung-thermal.git
  F:    drivers/thermal/samsung/
  
  SAMSUNG USB2 PHY DRIVER
@@@ -10174,8 -10022,8 +10174,9 @@@ S:   Supporte
  F:    drivers/media/pci/solo6x10/
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
+ M:    Shaohua Li <shli@kernel.org>
  L:    linux-raid@vger.kernel.org
 +T:    git git://neil.brown.name/md
  S:    Supported
  F:    drivers/md/
  F:    include/linux/raid/
@@@ -10189,7 -10037,7 +10190,7 @@@ F:   drivers/net/ethernet/natsemi/sonic.
  
  SONICS SILICON BACKPLANE DRIVER (SSB)
  M:    Michael Buesch <m@bues.ch>
 -L:    netdev@vger.kernel.org
 +L:    linux-wireless@vger.kernel.org
  S:    Maintained
  F:    drivers/ssb/
  F:    include/linux/ssb/
@@@ -10307,7 -10155,6 +10308,7 @@@ L:   spear-devel@list.st.co
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  W:    http://www.st.com/spear
  S:    Maintained
 +F:    arch/arm/boot/dts/spear*
  F:    arch/arm/mach-spear/
  
  SPEAR CLOCK FRAMEWORK SUPPORT
@@@ -10348,7 -10195,6 +10349,7 @@@ SQUASHFS FILE SYSTE
  M:    Phillip Lougher <phillip@squashfs.org.uk>
  L:    squashfs-devel@lists.sourceforge.net (subscribers-only)
  W:    http://squashfs.org.uk
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git
  S:    Maintained
  F:    Documentation/filesystems/squashfs.txt
  F:    fs/squashfs/
@@@ -10514,11 -10360,9 +10515,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/dlink/sundance.c
  
  SUPERH
 +M:    Yoshinori Sato <ysato@users.sourceforge.jp>
 +M:    Rich Felker <dalias@libc.org>
  L:    linux-sh@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/sh/
  F:    arch/sh/
  F:    drivers/sh/
@@@ -10547,7 -10391,6 +10548,7 @@@ F:   arch/x86/boot/video
  SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    linux-kernel@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
  S:    Supported
  F:    lib/swiotlb.c
  F:    arch/*/kernel/pci-swiotlb.c
@@@ -10811,7 -10654,6 +10812,7 @@@ TENSILICA XTENSA PORT (xtensa
  M:    Chris Zankel <chris@zankel.net>
  M:    Max Filippov <jcmvbkbc@gmail.com>
  L:    linux-xtensa@linux-xtensa.org
 +T:    git git://github.com/czankel/xtensa-linux.git
  S:    Maintained
  F:    arch/xtensa/
  F:    drivers/irqchip/irq-xtensa-*
@@@ -11094,7 -10936,7 +11095,7 @@@ R:   Jason Gunthorpe <jgunthorpe@obsidian
  W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
  Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
 -T:    https://github.com/PeterHuewe/linux-tpmdd
 +T:    git https://github.com/PeterHuewe/linux-tpmdd
  S:    Maintained
  F:    drivers/char/tpm/
  
@@@ -11551,7 -11393,6 +11552,7 @@@ M:   Richard Weinberger <richard@nod.at
  L:    user-mode-linux-devel@lists.sourceforge.net
  L:    user-mode-linux-user@lists.sourceforge.net
  W:    http://user-mode-linux.sourceforge.net
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git
  S:    Maintained
  F:    Documentation/virtual/uml/
  F:    arch/um/
@@@ -11598,7 -11439,6 +11599,7 @@@ F:   fs/fat
  VFIO DRIVER
  M:    Alex Williamson <alex.williamson@redhat.com>
  L:    kvm@vger.kernel.org
 +T:    git git://github.com/awilliam/linux-vfio.git
  S:    Maintained
  F:    Documentation/vfio.txt
  F:    drivers/vfio/
@@@ -11668,7 -11508,6 +11669,7 @@@ M:   "Michael S. Tsirkin" <mst@redhat.com
  L:    kvm@vger.kernel.org
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git
  S:    Maintained
  F:    drivers/vhost/
  F:    include/uapi/linux/vhost.h
@@@ -12085,7 -11924,7 +12086,7 @@@ M:   Dave Chinner <david@fromorbit.com
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
 -T:    git git://oss.sgi.com/xfs/xfs.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git
  S:    Supported
  F:    Documentation/filesystems/xfs.txt
  F:    fs/xfs/
@@@ -12150,7 -11989,7 +12151,7 @@@ F:   drivers/net/hamradio/*scc.
  F:    drivers/net/hamradio/z8530.h
  
  ZBUD COMPRESSED PAGE ALLOCATOR
 -M:    Seth Jennings <sjennings@variantweb.net>
 +M:    Seth Jennings <sjenning@redhat.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zbud.c
@@@ -12205,7 -12044,7 +12206,7 @@@ F:   include/linux/zsmalloc.
  F:    Documentation/vm/zsmalloc.txt
  
  ZSWAP COMPRESSED SWAP CACHING
 -M:    Seth Jennings <sjennings@variantweb.net>
 +M:    Seth Jennings <sjenning@redhat.com>
  L:    linux-mm@kvack.org
  S:    Maintained
  F:    mm/zswap.c