projects / cascardo / linux.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge tag 'iio-for-4.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...
[cascardo/linux.git] / MAINTAINERS
diff --git a/MAINTAINERS b/MAINTAINERS
index 048c3d1..1ace393 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -151,7 +151,7 @@ S:  Maintained
 F:     drivers/scsi/53c700*
 
 6LOWPAN GENERIC (BTLE/IEEE 802.15.4)
-M:     Alexander Aring <alex.aring@gmail.com>
+M:     Alexander Aring <aar@pengutronix.de>
 M:     Jukka Rissanen <jukka.rissanen@linux.intel.com>
 L:     linux-bluetooth@vger.kernel.org
 L:     linux-wpan@vger.kernel.org
@@ -228,16 +228,22 @@ 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
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/abituguru.c
 
 ABIT UGURU 3 HARDWARE MONITOR DRIVER
 M:     Alistair John Strachan <alistair@devzero.co.uk>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/abituguru3.c
 
+ACCES 104-DIO-48E GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-104-dio-48e.c
+
 ACCES 104-IDI-48 GPIO DRIVER
 M:     "William Breathitt Gray" <vilhelm.gray@gmail.com>
 L:     linux-gpio@vger.kernel.org
@@ -386,14 +392,14 @@ F:        Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
 
 ADM1025 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/adm1025
 F:     drivers/hwmon/adm1025.c
 
 ADM1029 HARDWARE MONITOR DRIVER
 M:     Corentin Labbe <clabbe.montjoie@gmail.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/adm1029.c
 
@@ -438,7 +444,7 @@ F:  drivers/video/backlight/adp8860_bl.c
 
 ADS1015 HARDWARE MONITOR DRIVER
 M:     Dirk Eibach <eibach@gdsys.de>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/ads1015
 F:     drivers/hwmon/ads1015.c
@@ -451,7 +457,7 @@ F:  drivers/macintosh/therm_adt746x.c
 
 ADT7475 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/adt7475
 F:     drivers/hwmon/adt7475.c
@@ -628,7 +634,7 @@ F:  include/linux/ccp.h
 
 AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 M:     Huang Rui <ray.huang@amd.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Supported
 F:     Documentation/hwmon/fam15h_power
 F:     drivers/hwmon/fam15h_power.c
@@ -673,11 +679,19 @@ F:        drivers/gpu/drm/radeon/radeon_kfd.c
 F:     drivers/gpu/drm/radeon/radeon_kfd.h
 F:     include/uapi/linux/kfd_ioctl.h
 
+AMD SEATTLE DEVICE TREE SUPPORT
+M:     Brijesh Singh <brijeshkumar.singh@amd.com>
+M:     Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
+M:     Tom Lendacky <thomas.lendacky@amd.com>
+S:     Supported
+F:     arch/arm64/boot/dts/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:     arch/arm64/boot/dts/amd/amd-seattle-xgbe*.dtsi
 
 AMS (Apple Motion Sensor) DRIVER
 M:     Michael Hanselmann <linux-kernel@hansmi.ch>
@@ -792,7 +806,7 @@ F:  drivers/input/mouse/bcm5974.c
 
 APPLE SMC DRIVER
 M:     Henrik Rydberg <rydberg@bitmath.org>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Odd fixes
 F:     drivers/hwmon/applesmc.c
 
@@ -833,6 +847,12 @@ S: Maintained
 F:     drivers/net/arcnet/
 F:     include/uapi/linux/if_arcnet.h
 
+ARM HDLCD DRM DRIVER
+M:     Liviu Dudau <liviu.dudau@arm.com>
+S:     Supported
+F:     drivers/gpu/drm/arm/
+F:     Documentation/devicetree/bindings/display/arm,hdlcd.txt
+
 ARM MFM AND FLOPPY DRIVERS
 M:     Ian Molton <spyro@f2s.com>
 S:     Maintained
@@ -945,6 +965,16 @@ F: arch/arm/boot/dts/alpine*
 F:     arch/arm64/boot/dts/al/
 F:     drivers/*/*alpine*
 
+ARM/ARTPEC MACHINE SUPPORT
+M:     Jesper Nilsson <jesper.nilsson@axis.com>
+M:     Lars Persson <lars.persson@axis.com>
+M:     Niklas Cassel <niklas.cassel@axis.com>
+S:     Maintained
+L:     linux-arm-kernel@axis.com
+F:     arch/arm/mach-artpec
+F:     arch/arm/boot/dts/artpec6*
+F:     drivers/clk/clk-artpec6.c
+
 ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
 M:     Nicolas Ferre <nicolas.ferre@atmel.com>
 M:     Alexandre Belloni <alexandre.belloni@free-electrons.com>
@@ -1291,6 +1321,7 @@ F:        arch/arm/mach-mvebu/
 F:     drivers/rtc/rtc-armada38x.c
 F:     arch/arm/boot/dts/armada*
 F:     arch/arm/boot/dts/kirkwood*
+F:     arch/arm64/boot/dts/marvell/armada*
 
 
 ARM/Marvell Berlin SoC support
@@ -1509,6 +1540,7 @@ F:        arch/arm/mach-s5p*/
 F:     arch/arm/mach-exynos*/
 F:     drivers/*/*s3c2410*
 F:     drivers/*/*/*s3c2410*
+F:     drivers/soc/samsung/*
 F:     drivers/spi/spi-s3c*
 F:     sound/soc/samsung/*
 F:     Documentation/arm/Samsung/
@@ -1806,11 +1838,13 @@ F:      drivers/edac/synopsys_edac.c
 
 ARM SMMU DRIVERS
 M:     Will Deacon <will.deacon@arm.com>
+R:     Robin Murphy <robin.murphy@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 F:     drivers/iommu/arm-smmu.c
 F:     drivers/iommu/arm-smmu-v3.c
 F:     drivers/iommu/io-pgtable-arm.c
+F:     drivers/iommu/io-pgtable-arm-v7s.c
 
 ARM64 PORT (AARCH64 ARCHITECTURE)
 M:     Catalin Marinas <catalin.marinas@arm.com>
@@ -1831,7 +1865,7 @@ F:        include/media/i2c/as3645a.h
 
 ASC7621 HARDWARE MONITOR DRIVER
 M:     George Joseph <george.joseph@fairview5.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/asc7621
 F:     drivers/hwmon/asc7621.c
@@ -1924,7 +1958,7 @@ F:        drivers/net/wireless/ath/carl9170/
 
 ATK0110 HWMON DRIVER
 M:     Luca Tettamanti <kronos.it@gmail.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/asus_atk0110.c
 
@@ -2170,7 +2204,8 @@ M:        Marek Lindner <mareklindner@neomailbox.ch>
 M:     Simon Wunderlich <sw@simonwunderlich.de>
 M:     Antonio Quartulli <a@unstable.cc>
 L:     b.a.t.m.a.n@lists.open-mesh.org
-W:     http://www.open-mesh.org/
+W:     https://www.open-mesh.org/
+Q:     https://patchwork.open-mesh.org/project/batman/list/
 S:     Maintained
 F:     net/batman-adv/
 
@@ -2399,8 +2434,9 @@ F:        arch/arm/boot/dts/bcm470*
 
 BROADCOM BCM63XX ARM ARCHITECTURE
 M:     Florian Fainelli <f.fainelli@gmail.com>
-L:     linux-arm-kernel@lists.infradead.org
-T:     git git://github.com/broadcom/arm-bcm63xx.git
+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/bcm63xx.c
 F:     arch/arm/include/debug/bcm63xx.S
@@ -2434,12 +2470,14 @@ F:      arch/mips/bmips/*
 F:     arch/mips/include/asm/mach-bmips/*
 F:     arch/mips/kernel/*bmips*
 F:     arch/mips/boot/dts/brcm/bcm*.dts*
+F:     drivers/irqchip/irq-bcm63*
 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:     Siva Reddy Kallam <siva.kallam@broadcom.com>
 M:     Prashant Sreedharan <prashant@broadcom.com>
 M:     Michael Chan <mchan@broadcom.com>
 L:     netdev@vger.kernel.org
@@ -2531,6 +2569,13 @@ L:       netdev@vger.kernel.org
 S:     Supported
 F:     drivers/net/ethernet/broadcom/bcmsysport.*
 
+BROADCOM VULCAN ARM64 SOC
+M:     Jayachandran C. <jchandra@broadcom.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     bcm-kernel-feedback-list@broadcom.com
+S:     Maintained
+F:     arch/arm64/boot/dts/broadcom/vulcan*
+
 BROCADE BFA FC SCSI DRIVER
 M:     Anil Gurumurthy <anil.gurumurthy@qlogic.com>
 M:     Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
@@ -3049,7 +3094,7 @@ F:        mm/swap_cgroup.c
 
 CORETEMP HARDWARE MONITORING DRIVER
 M:     Fenghua Yu <fenghua.yu@intel.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/coretemp
 F:     drivers/hwmon/coretemp.c
@@ -3516,6 +3561,14 @@ F:       include/linux/device-mapper.h
 F:     include/linux/dm-*.h
 F:     include/uapi/linux/dm-*.h
 
+DEVLINK
+M:     Jiri Pirko <jiri@mellanox.com>
+L:     netdev@vger.kernel.org
+S:     Supported
+F:     net/core/devlink.c
+F:     include/net/devlink.h
+F:     include/uapi/linux/devlink.h
+
 DIALOG SEMICONDUCTOR DRIVERS
 M:     Support Opensource <support.opensource@diasemi.com>
 W:     http://www.dialog-semiconductor.com/products
@@ -3630,7 +3683,7 @@ T:        git git://git.infradead.org/users/vkoul/slave-dma.git
 
 DME1737 HARDWARE MONITOR DRIVER
 M:     Juerg Haefliger <juergh@gmail.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/dme1737
 F:     drivers/hwmon/dme1737.c
@@ -3709,7 +3762,7 @@ F:        drivers/gpu/vga/
 F:     include/drm/
 F:     include/uapi/drm/
 
-RADEON DRM DRIVERS
+RADEON and AMDGPU DRM DRIVERS
 M:     Alex Deucher <alexander.deucher@amd.com>
 M:     Christian König <christian.koenig@amd.com>
 L:     dri-devel@lists.freedesktop.org
@@ -3717,6 +3770,8 @@ T:        git git://people.freedesktop.org/~agd5f/linux
 S:     Supported
 F:     drivers/gpu/drm/radeon/
 F:     include/uapi/drm/radeon*
+F:     drivers/gpu/drm/amd/
+F:     include/uapi/drm/amdgpu*
 
 DRM PANEL DRIVERS
 M:     Thierry Reding <thierry.reding@gmail.com>
@@ -3761,7 +3816,7 @@ F:        include/drm/exynos*
 F:     include/uapi/drm/exynos*
 
 DRM DRIVERS FOR FREESCALE DCU
-M:     Jianwei Wang <jianwei.wang.chn@gmail.com>
+M:     Stefan Agner <stefan@agner.ch>
 M:     Alison Wang <alison.wang@freescale.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Supported
@@ -4233,13 +4288,6 @@ M:       Maxim Levitsky <maximlevitsky@gmail.com>
 S:     Maintained
 F:     drivers/media/rc/ene_ir.*
 
-ENHANCED ERROR HANDLING (EEH)
-M:     Gavin Shan <shangw@linux.vnet.ibm.com>
-L:     linuxppc-dev@lists.ozlabs.org
-S:     Supported
-F:     Documentation/powerpc/eeh-pci-error-recovery.txt
-F:     arch/powerpc/kernel/eeh*.c
-
 EPSON S1D13XXX FRAMEBUFFER DRIVER
 M:     Kristoffer Ericson <kristoffer.ericson@gmail.com>
 S:     Maintained
@@ -4316,6 +4364,12 @@ L:       dri-devel@lists.freedesktop.org
 S:     Maintained
 F:     drivers/gpu/drm/exynos/exynos_dp*
 
+EXYNOS SYSMMU (IOMMU) driver
+M:     Marek Szyprowski <m.szyprowski@samsung.com>
+L:     iommu@lists.linux-foundation.org
+S:     Maintained
+F:     drivers/iommu/exynos-iommu.c
+
 EXYNOS MIPI DISPLAY DRIVERS
 M:     Inki Dae <inki.dae@samsung.com>
 M:     Donghwa Lee <dh09.lee@samsung.com>
@@ -4327,7 +4381,7 @@ F:        include/video/exynos_mipi*
 
 F71805F HARDWARE MONITORING DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/f71805f
 F:     drivers/hwmon/f71805f.c
@@ -4406,7 +4460,7 @@ F:        fs/*
 
 FINTEK F75375S HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:     Riku Voipio <riku.voipio@iki.fi>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/f75375s.c
 F:     include/linux/f75375s.h
@@ -4523,6 +4577,12 @@ L:       linuxppc-dev@lists.ozlabs.org
 S:     Maintained
 F:     drivers/dma/fsldma.*
 
+FREESCALE GPMI NAND DRIVER
+M:     Han Xu <han.xu@nxp.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/gpmi-nand/*
+
 FREESCALE I2C CPM DRIVER
 M:     Jochen Friedrich <jochen@scram.de>
 L:     linuxppc-dev@lists.ozlabs.org
@@ -4539,7 +4599,7 @@ F:        include/linux/platform_data/video-imxfb.h
 F:     drivers/video/fbdev/imxfb.c
 
 FREESCALE QUAD SPI DRIVER
-M:     Han Xu <han.xu@freescale.com>
+M:     Han Xu <han.xu@nxp.com>
 L:     linux-mtd@lists.infradead.org
 S:     Maintained
 F:     drivers/mtd/spi-nor/fsl-quadspi.c
@@ -4553,6 +4613,15 @@ S:       Maintained
 F:     drivers/net/ethernet/freescale/fs_enet/
 F:     include/linux/fs_enet_pd.h
 
+FREESCALE IMX / MXC FEC DRIVER
+M:     Fugang Duan <fugang.duan@nxp.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/freescale/fec_main.c
+F:     drivers/net/ethernet/freescale/fec_ptp.c
+F:     drivers/net/ethernet/freescale/fec.h
+F:     Documentation/devicetree/bindings/net/fsl-fec.txt
+
 FREESCALE QUICC ENGINE LIBRARY
 L:     linuxppc-dev@lists.ozlabs.org
 S:     Orphan
@@ -4816,10 +4885,14 @@ L:      linux-gpio@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git
 S:     Maintained
 F:     Documentation/gpio/
+F:     Documentation/ABI/testing/gpio-cdev
+F:     Documentation/ABI/obsolete/sysfs-gpio
 F:     drivers/gpio/
 F:     include/linux/gpio/
 F:     include/linux/gpio.h
 F:     include/asm-generic/gpio.h
+F:     include/uapi/linux/gpio.h
+F:     tools/gpio/
 
 GRE DEMULTIPLEXER DRIVER
 M:     Dmitry Kozlov <xeb@mail.ru>
@@ -4948,8 +5021,8 @@ F:        drivers/media/usb/hackrf/
 HARDWARE MONITORING
 M:     Jean Delvare <jdelvare@suse.com>
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
-W:     http://www.lm-sensors.org/
+L:     linux-hwmon@vger.kernel.org
+W:     http://hwmon.wiki.kernel.org/
 T:     quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 S:     Maintained
@@ -4968,6 +5041,7 @@ F:        include/linux/hw_random.h
 
 HARDWARE SPINLOCK CORE
 M:     Ohad Ben-Cohen <ohad@wizery.com>
+M:     Bjorn Andersson <bjorn.andersson@linaro.org>
 S:     Maintained
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
 F:     Documentation/hwspinlock.txt
@@ -4989,16 +5063,10 @@ T:      git git://linuxtv.org/anttip/media_tree.git
 S:     Maintained
 F:     drivers/media/dvb-frontends/hd29l2*
 
-HEWLETT-PACKARD SMART2 RAID DRIVER
-L:     iss_storagedev@hp.com
-S:     Orphan
-F:     Documentation/blockdev/cpqarray.txt
-F:     drivers/block/cpqarray.*
-
 HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa)
-M:     Don Brace <don.brace@pmcs.com>
+M:     Don Brace <don.brace@microsemi.com>
 L:     iss_storagedev@hp.com
-L:     storagedev@pmcs.com
+L:     esc.storagedev@microsemi.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     Documentation/scsi/hpsa.txt
@@ -5007,9 +5075,9 @@ F:        include/linux/cciss*.h
 F:     include/uapi/linux/cciss*.h
 
 HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
-M:     Don Brace <don.brace@pmcs.com>
+M:     Don Brace <don.brace@microsemi.com>
 L:     iss_storagedev@hp.com
-L:     storagedev@pmcs.com
+L:     esc.storagedev@microsemi.com
 L:     linux-scsi@vger.kernel.org
 S:     Supported
 F:     Documentation/blockdev/cciss.txt
@@ -5194,6 +5262,7 @@ F:        arch/x86/kernel/cpu/mshyperv.c
 F:     drivers/hid/hid-hyperv.c
 F:     drivers/hv/
 F:     drivers/input/serio/hyperv-keyboard.c
+F:     drivers/pci/host/pci-hyperv.c
 F:     drivers/net/hyperv/
 F:     drivers/scsi/storvsc_drv.c
 F:     drivers/video/fbdev/hyperv_fb.c
@@ -5201,6 +5270,16 @@ F:       include/linux/hyperv.h
 F:     tools/hv/
 F:     Documentation/ABI/stable/sysfs-bus-vmbus
 
+I2C MUXES
+M:     Peter Rosin <peda@axentia.se>
+L:     linux-i2c@vger.kernel.org
+S:     Maintained
+F:     Documentation/i2c/muxes/
+F:     Documentation/devicetree/bindings/i2c/i2c-mux*
+F:     drivers/i2c/i2c-mux.c
+F:     drivers/i2c/muxes/
+F:     include/linux/i2c-mux.h
+
 I2C OVER PARALLEL PORT
 M:     Jean Delvare <jdelvare@suse.com>
 L:     linux-i2c@vger.kernel.org
@@ -5425,10 +5504,11 @@ S:      Supported
 F:     drivers/idle/i7300_idle.c
 
 IEEE 802.15.4 SUBSYSTEM
-M:     Alexander Aring <alex.aring@gmail.com>
+M:     Alexander Aring <aar@pengutronix.de>
 L:     linux-wpan@vger.kernel.org
-W:     https://github.com/linux-wpan
-T:     git git://github.com/linux-wpan/linux-wpan-next.git
+W:     http://wpan.cakelab.org/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git
 S:     Maintained
 F:     net/ieee802154/
 F:     net/mac802154/
@@ -5474,7 +5554,7 @@ F:        drivers/usb/atm/ueagle-atm.c
 
 INA209 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/ina209
 F:     Documentation/devicetree/bindings/i2c/ina209.txt
@@ -5482,7 +5562,7 @@ F:        drivers/hwmon/ina209.c
 
 INA2XX HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/ina2xx
 F:     drivers/hwmon/ina2xx.c
@@ -5558,6 +5638,7 @@ F:        drivers/input/
 F:     include/linux/input.h
 F:     include/uapi/linux/input.h
 F:     include/linux/input/
+F:     Documentation/devicetree/bindings/input/
 
 INPUT MULTITOUCH (MT) PROTOCOL
 M:     Henrik Rydberg <rydberg@bitmath.org>
@@ -5689,6 +5770,16 @@ F:       Documentation/networking/i40evf.txt
 F:     drivers/net/ethernet/intel/
 F:     drivers/net/ethernet/intel/*/
 
+INTEL RDMA RNIC DRIVER
+M:     Faisal Latif <faisal.latif@intel.com>
+R:     Chien Tin Tung <chien.tin.tung@intel.com>
+R:     Mustafa Ismail <mustafa.ismail@intel.com>
+R:     Shiraz Saleem <shiraz.saleem@intel.com>
+R:     Tatyana Nikolova <tatyana.e.nikolova@intel.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/hw/i40iw/
+
 INTEL-MID GPIO DRIVER
 M:     David Cohen <david.a.cohen@linux.intel.com>
 L:     linux-gpio@vger.kernel.org
@@ -5976,7 +6067,7 @@ F:        drivers/isdn/hardware/eicon/
 
 IT87 HARDWARE MONITORING DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/it87
 F:     drivers/hwmon/it87.c
@@ -6012,7 +6103,7 @@ F:        drivers/media/dvb-frontends/ix2505v*
 
 JC42.4 TEMPERATURE SENSOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/jc42.c
 F:     Documentation/hwmon/jc42
@@ -6055,25 +6146,39 @@ S:      Maintained
 F:     drivers/media/platform/rcar_jpu.c
 
 JSM Neo PCI based serial card
-M:     Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
+M:     Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com>
 L:     linux-serial@vger.kernel.org
 S:     Maintained
 F:     drivers/tty/serial/jsm/
 
 K10TEMP HARDWARE MONITORING DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/k10temp
 F:     drivers/hwmon/k10temp.c
 
 K8TEMP HARDWARE MONITORING DRIVER
 M:     Rudolf Marek <r.marek@assembler.cz>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/k8temp
 F:     drivers/hwmon/k8temp.c
 
+KASAN
+M:     Andrey Ryabinin <aryabinin@virtuozzo.com>
+R:     Alexander Potapenko <glider@google.com>
+R:     Dmitry Vyukov <dvyukov@google.com>
+L:     kasan-dev@googlegroups.com
+S:     Maintained
+F:     arch/*/include/asm/kasan.h
+F:     arch/*/mm/kasan_init*
+F:     Documentation/kasan.txt
+F:     include/linux/kasan.h
+F:     lib/test_kasan.c
+F:     mm/kasan/
+F:     scripts/Makefile.kasan
+
 KCONFIG
 M:     "Yann E. MORIN" <yann.morin.1998@free.fr>
 L:     linux-kbuild@vger.kernel.org
@@ -6573,9 +6678,10 @@ F:       drivers/platform/x86/hp_accel.c
 
 LIVE PATCHING
 M:     Josh Poimboeuf <jpoimboe@redhat.com>
-M:     Seth Jennings <sjenning@redhat.com>
+M:     Jessica Yu <jeyu@redhat.com>
 M:     Jiri Kosina <jikos@kernel.org>
-M:     Vojtech Pavlik <vojtech@suse.com>
+M:     Miroslav Benes <mbenes@suse.cz>
+R:     Petr Mladek <pmladek@suse.com>
 S:     Maintained
 F:     kernel/livepatch/
 F:     include/linux/livepatch.h
@@ -6586,6 +6692,11 @@ F:       samples/livepatch/
 L:     live-patching@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
 
+LINUX KERNEL DUMP TEST MODULE (LKDTM)
+M:     Kees Cook <keescook@chromium.org>
+S:     Maintained
+F:     drivers/misc/lkdtm.c
+
 LLC (802.2)
 M:     Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:     Maintained
@@ -6596,27 +6707,27 @@ F:      net/llc/
 
 LM73 HARDWARE MONITOR DRIVER
 M:     Guillaume Ligneul <guillaume.ligneul@gmail.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/lm73.c
 
 LM78 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/lm78
 F:     drivers/hwmon/lm78.c
 
 LM83 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/lm83
 F:     drivers/hwmon/lm83.c
 
 LM90 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/lm90
 F:     Documentation/devicetree/bindings/hwmon/lm90.txt
@@ -6624,7 +6735,7 @@ F:        drivers/hwmon/lm90.c
 
 LM95234 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/lm95234
 F:     drivers/hwmon/lm95234.c
@@ -6671,13 +6782,12 @@ S:      Maintained
 F:     arch/arm/mach-lpc32xx/
 
 LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
-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
+M:     Sathya Prakash <sathya.prakash@broadcom.com>
+M:     Chaitra P B <chaitra.basappa@broadcom.com>
+M:     Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
+L:     MPT-FusionLinux.pdl@broadcom.com
 L:     linux-scsi@vger.kernel.org
-W:     http://www.lsilogic.com/support
+W:     http://www.avagotech.com/support/
 S:     Supported
 F:     drivers/message/fusion/
 F:     drivers/scsi/mpt2sas/
@@ -6691,7 +6801,7 @@ F:        drivers/scsi/sym53c8xx_2/
 
 LTC4261 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/ltc4261
 F:     drivers/hwmon/ltc4261.c
@@ -6770,6 +6880,7 @@ S:        Maintained
 F:     Documentation/networking/mac80211-injection.txt
 F:     include/net/mac80211.h
 F:     net/mac80211/
+F:     drivers/net/wireless/mac80211_hwsim.[ch]
 
 MACVLAN DRIVER
 M:     Patrick McHardy <kaber@trash.net>
@@ -6860,28 +6971,28 @@ F:      include/uapi/linux/matroxfb.h
 
 MAX16065 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/max16065
 F:     drivers/hwmon/max16065.c
 
 MAX20751 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/max20751
 F:     drivers/hwmon/max20751.c
 
 MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
 M:     "Hans J. Koch" <hjk@hansjkoch.de>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/max6650
 F:     drivers/hwmon/max6650.c
 
 MAX6697 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/max6697
 F:     Documentation/devicetree/bindings/i2c/max6697.txt
@@ -6899,7 +7010,7 @@ MAXIM MAX77802 MULTIFUNCTION PMIC DEVICE DRIVERS
 M:     Javier Martinez Canillas <javier@osg.samsung.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
-F:     drivers/*/*max77802.c
+F:     drivers/*/*max77802*.c
 F:     Documentation/devicetree/bindings/*/*max77802.txt
 F:     include/dt-bindings/*/*max77802.h
 
@@ -6909,7 +7020,7 @@ M:        Krzysztof Kozlowski <k.kozlowski@samsung.com>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     drivers/*/max14577.c
-F:     drivers/*/max77686.c
+F:     drivers/*/max77686*.c
 F:     drivers/*/max77693.c
 F:     drivers/extcon/extcon-max14577.c
 F:     drivers/extcon/extcon-max77693.c
@@ -7014,6 +7125,13 @@ F:       include/uapi/linux/meye.h
 F:     include/uapi/linux/ivtv*
 F:     include/uapi/linux/uvcvideo.h
 
+MEDIATEK ETHERNET DRIVER
+M:     Felix Fietkau <nbd@openwrt.org>
+M:     John Crispin <blogic@openwrt.org>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/ethernet/mediatek/
+
 MEDIATEK MT7601U WIRELESS LAN DRIVER
 M:     Jakub Kicinski <kubakici@wp.pl>
 L:     linux-wireless@vger.kernel.org
@@ -7225,10 +7343,8 @@ L:       linux-media@vger.kernel.org
 W:     https://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/staging/media/mn88473/
-F:     drivers/media/dvb-frontends/mn88473.h
+F:     drivers/media/dvb-frontends/mn88473*
 
 MODULE SUPPORT
 M:     Rusty Russell <rusty@rustcorp.com.au>
@@ -7389,6 +7505,17 @@ W:       https://www.myricom.com/support/downloads/myri10ge.html
 S:     Supported
 F:     drivers/net/ethernet/myricom/myri10ge/
 
+NAND FLASH SUBSYSTEM
+M:     Boris Brezillon <boris.brezillon@free-electrons.com>
+R:     Richard Weinberger <richard@nod.at>
+L:     linux-mtd@lists.infradead.org
+W:     http://www.linux-mtd.infradead.org/
+Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
+T:     git git://github.com/linux-nand/linux.git
+S:     Maintained
+F:     drivers/mtd/nand/
+F:     include/linux/mtd/nand*.h
+
 NATSEMI ETHERNET DRIVER (DP8381x)
 S:     Orphan
 F:     drivers/net/ethernet/natsemi/natsemi.c
@@ -7434,7 +7561,7 @@ F:        drivers/scsi/NCR_D700.*
 
 NCT6775 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/nct6775
 F:     drivers/hwmon/nct6775.c
@@ -7502,7 +7629,6 @@ F:        net/netrom/
 
 NETRONOME ETHERNET DRIVERS
 M:     Jakub Kicinski <jakub.kicinski@netronome.com>
-M:     Rolf Neugebauer <rolf.neugebauer@netronome.com>
 L:     oss-drivers@netronome.com
 S:     Maintained
 F:     drivers/net/ethernet/netronome/
@@ -7639,7 +7765,6 @@ F:        net/nfc/
 F:     include/net/nfc/
 F:     include/uapi/linux/nfc.h
 F:     drivers/nfc/
-F:     include/linux/platform_data/microread.h
 F:     include/linux/platform_data/nfcmrvl.h
 F:     include/linux/platform_data/nxp-nci.h
 F:     include/linux/platform_data/pn544.h
@@ -7790,6 +7915,11 @@ L:       alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/tfa9879*
 
+OBJTOOL
+M:     Josh Poimboeuf <jpoimboe@redhat.com>
+S:     Supported
+F:     tools/objtool/
+
 OMAP SUPPORT
 M:     Tony Lindgren <tony@atomide.com>
 L:     linux-omap@vger.kernel.org
@@ -7840,7 +7970,7 @@ S:        Maintained
 F:     arch/arm/*omap*/*clock*
 
 OMAP POWER MANAGEMENT SUPPORT
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Kevin Hilman <khilman@kernel.org>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     arch/arm/*omap*/*pm*
@@ -7944,7 +8074,7 @@ F:        arch/arm/*omap*/usb*
 OMAP GPIO DRIVER
 M:     Grygorii Strashko <grygorii.strashko@ti.com>
 M:     Santosh Shilimkar <ssantosh@kernel.org>
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Kevin Hilman <khilman@kernel.org>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/gpio/gpio-omap.txt
@@ -8121,6 +8251,14 @@ S:       Supported
 F:     fs/overlayfs/
 F:     Documentation/filesystems/overlayfs.txt
 
+ORANGEFS FILESYSTEM
+M:     Mike Marshall <hubcap@omnibond.com>
+L:     pvfs2-developers@beowulf-underground.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git
+S:     Supported
+F:     fs/orangefs/
+F:     Documentation/filesystems/orangefs.txt
+
 P54 WIRELESS DRIVER
 M:     Christian Lamparter <chunkeey@googlemail.com>
 L:     linux-wireless@vger.kernel.org
@@ -8221,7 +8359,7 @@ F:        drivers/video/logo/logo_parisc*
 
 PC87360 HARDWARE MONITORING DRIVER
 M:     Jim Cromie <jim.cromie@gmail.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/pc87360
 F:     drivers/hwmon/pc87360.c
@@ -8233,7 +8371,7 @@ F:        drivers/char/pc8736x_gpio.c
 
 PC87427 HARDWARE MONITORING DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/pc87427
 F:     drivers/hwmon/pc87427.c
@@ -8261,6 +8399,15 @@ L:       linux-pci@vger.kernel.org
 S:     Supported
 F:     Documentation/PCI/pci-error-recovery.txt
 
+PCI ENHANCED ERROR HANDLING (EEH) FOR POWERPC
+M:     Russell Currey <ruscur@russell.cc>
+L:     linuxppc-dev@lists.ozlabs.org
+S:     Supported
+F:     Documentation/powerpc/eeh-pci-error-recovery.txt
+F:     arch/powerpc/kernel/eeh*.c
+F:     arch/powerpc/platforms/*/eeh*.c
+F:     arch/powerpc/include/*/eeh*.h
+
 PCI SUBSYSTEM
 M:     Bjorn Helgaas <bhelgaas@google.com>
 L:     linux-pci@vger.kernel.org
@@ -8368,12 +8515,20 @@ L:      linux-pci@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/host/*designware*
 
+PCI DRIVER FOR SYNOPSYS PROTOTYPING DEVICE
+M:     Joao Pinto <jpinto@synopsys.com>
+L:     linux-pci@vger.kernel.org
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/designware-pcie.txt
+F:     drivers/pci/host/pcie-designware-plat.c
+
 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-common.c
 F:     drivers/pci/host/pci-host-generic.c
 
 PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
@@ -8419,6 +8574,14 @@ L:     linux-arm-msm@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/host/*qcom*
 
+PCIE DRIVER FOR CAVIUM THUNDERX
+M:     David Daney <david.daney@cavium.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Supported
+F:     Documentation/devicetree/bindings/pci/pci-thunder-*
+F:     drivers/pci/host/pci-thunder-*
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org
@@ -8444,7 +8607,7 @@ F:        include/crypto/pcrypt.h
 
 PER-CPU MEMORY ALLOCATOR
 M:     Tejun Heo <tj@kernel.org>
-M:     Christoph Lameter <cl@linux-foundation.org>
+M:     Christoph Lameter <cl@linux.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
 S:     Maintained
 F:     include/linux/percpu*.h
@@ -8461,6 +8624,7 @@ PERFORMANCE EVENTS SUBSYSTEM
 M:     Peter Zijlstra <peterz@infradead.org>
 M:     Ingo Molnar <mingo@redhat.com>
 M:     Arnaldo Carvalho de Melo <acme@kernel.org>
+R:     Alexander Shishkin <alexander.shishkin@linux.intel.com>
 L:     linux-kernel@vger.kernel.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core
 S:     Supported
@@ -8587,8 +8751,8 @@ F:        drivers/rtc/rtc-puv3.c
 
 PMBUS HARDWARE MONITORING DRIVERS
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
-W:     http://www.lm-sensors.org/
+L:     linux-hwmon@vger.kernel.org
+W:     http://hwmon.wiki.kernel.org/
 W:     http://www.roeck-us.net/linux/drivers/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 S:     Maintained
@@ -8793,7 +8957,7 @@ F:        drivers/media/usb/pwc/*
 
 PWM FAN DRIVER
 M:     Kamil Debski <k.debski@samsung.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Supported
 F:     Documentation/devicetree/bindings/hwmon/pwm-fan.txt
 F:     Documentation/hwmon/pwm-fan
@@ -9083,10 +9247,20 @@ S:      Maintained
 F:     drivers/net/ethernet/rdc/r6040.c
 
 RDS - RELIABLE DATAGRAM SOCKETS
-M:     Chien Yen <chien.yen@oracle.com>
+M:     Santosh Shilimkar <santosh.shilimkar@oracle.com>
+L:     netdev@vger.kernel.org
+L:     linux-rdma@vger.kernel.org
 L:     rds-devel@oss.oracle.com (moderated for non-subscribers)
+W:     https://oss.oracle.com/projects/rds/
 S:     Supported
 F:     net/rds/
+F:     Documentation/networking/rds.txt
+
+RDMAVT - RDMA verbs software
+M:     Dennis Dalessandro <dennis.dalessandro@intel.com>
+L:     linux-rdma@vger.kernel.org
+S:     Supported
+F:     drivers/infiniband/sw/rdmavt
 
 READ-COPY UPDATE (RCU)
 M:     "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
@@ -9139,6 +9313,7 @@ F:        include/linux/regmap.h
 
 REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
 M:     Ohad Ben-Cohen <ohad@wizery.com>
+M:     Bjorn Andersson <bjorn.andersson@linaro.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git
 S:     Maintained
 F:     drivers/remoteproc/
@@ -9147,6 +9322,7 @@ F:        include/linux/remoteproc.h
 
 REMOTE PROCESSOR MESSAGING (RPMSG) SUBSYSTEM
 M:     Ohad Ben-Cohen <ohad@wizery.com>
+M:     Bjorn Andersson <bjorn.andersson@linaro.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.git
 S:     Maintained
 F:     drivers/rpmsg/
@@ -9485,6 +9661,7 @@ F:        drivers/media/i2c/s5k5baf.c
 
 SAMSUNG S3FWRN5 NFC DRIVER
 M:     Robert Baldyga <r.baldyga@samsung.com>
+M:     Krzysztof Opasiak <k.opasiak@samsung.com>
 L:     linux-nfc@lists.01.org (moderated for non-subscribers)
 S:     Supported
 F:     drivers/nfc/s3fwrn5
@@ -9547,9 +9724,9 @@ F: Documentation/devicetree/bindings/net/snps,dwc-qos-ethernet.txt
 F: drivers/net/ethernet/synopsys/dwc_eth_qos.c
 
 SYNOPSYS DESIGNWARE I2C DRIVER
-M:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
 M:     Jarkko Nikula <jarkko.nikula@linux.intel.com>
-M:     Mika Westerberg <mika.westerberg@linux.intel.com>
+R:     Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+R:     Mika Westerberg <mika.westerberg@linux.intel.com>
 L:     linux-i2c@vger.kernel.org
 S:     Maintained
 F:     drivers/i2c/busses/i2c-designware-*
@@ -9658,7 +9835,7 @@ F:        drivers/scsi/sg.c
 F:     include/scsi/sg.h
 
 SCSI SUBSYSTEM
-M:     "James E.J. Bottomley" <JBottomley@odin.com>
+M:     "James E.J. Bottomley" <jejb@linux.vnet.ibm.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 M:     "Martin K. Petersen" <martin.petersen@oracle.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
@@ -9715,10 +9892,12 @@ S:      Maintained
 F:     drivers/mmc/host/sdricoh_cs.c
 
 SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) DRIVER
+M:     Adrian Hunter <adrian.hunter@intel.com>
 L:     linux-mmc@vger.kernel.org
-S:     Orphan
-F:     drivers/mmc/host/sdhci.*
-F:     drivers/mmc/host/sdhci-pltfm.[ch]
+T:     git git://git.infradead.org/users/ahunter/linux-sdhci.git
+S:     Maintained
+F:     drivers/mmc/host/sdhci*
+F:     include/linux/mmc/sdhci*
 
 SECURE COMPUTING
 M:     Kees Cook <keescook@chromium.org>
@@ -9968,7 +10147,7 @@ F:       arch/arm/mach-s3c24xx/bast-irq.c
 
 TI DAVINCI MACHINE SUPPORT
 M:     Sekhar Nori <nsekhar@ti.com>
-M:     Kevin Hilman <khilman@deeprootsystems.com>
+M:     Kevin Hilman <khilman@kernel.org>
 T:     git git://gitorious.org/linux-davinci/linux-davinci.git
 Q:     http://patchwork.kernel.org/project/linux-davinci/list/
 S:     Supported
@@ -10099,28 +10278,28 @@ F:    Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
 
 SMM665 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/smm665
 F:     drivers/hwmon/smm665.c
 
 SMSC EMC2103 HARDWARE MONITOR DRIVER
 M:     Steve Glendinning <steve.glendinning@shawell.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/emc2103
 F:     drivers/hwmon/emc2103.c
 
 SMSC SCH5627 HARDWARE MONITOR DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Supported
 F:     Documentation/hwmon/sch5627
 F:     drivers/hwmon/sch5627.c
 
 SMSC47B397 HARDWARE MONITOR DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/smsc47b397
 F:     drivers/hwmon/smsc47b397.c
@@ -10170,7 +10349,7 @@ 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
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git
 S:     Supported
 F:     drivers/md/
 F:     include/linux/raid/
@@ -10852,6 +11031,14 @@ L:     linux-omap@vger.kernel.org
 S:     Maintained
 F:     drivers/thermal/ti-soc-thermal/
 
+TI VPE/CAL DRIVERS
+M:     Benoit Parrot <bparrot@ti.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/platform/ti-vpe/
+
 TI CDCE706 CLOCK DRIVER
 M:     Max Filippov <jcmvbkbc@gmail.com>
 S:     Maintained
@@ -11040,7 +11227,7 @@ F:      include/linux/mmc/sh_mobile_sdhi.h
 
 TMP401 HARDWARE MONITOR DRIVER
 M:     Guenter Roeck <linux@roeck-us.net>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/tmp401
 F:     drivers/hwmon/tmp401.c
@@ -11075,8 +11262,8 @@ M:      Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 R:     Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
 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:     git https://github.com/PeterHuewe/linux-tpmdd
+Q:     https://patchwork.kernel.org/project/tpmdd-devel/list/
+T:     git git://git.infradead.org/users/jjs/linux-tpmdd.git
 S:     Maintained
 F:     drivers/char/tpm/
 
@@ -11161,12 +11348,13 @@ S:    Maintained
 F:     drivers/scsi/u14-34f.c
 
 UBI FILE SYSTEM (UBIFS)
+M:     Richard Weinberger <richard@nod.at>
 M:     Artem Bityutskiy <dedekind1@gmail.com>
 M:     Adrian Hunter <adrian.hunter@intel.com>
 L:     linux-mtd@lists.infradead.org
 T:     git git://git.infradead.org/ubifs-2.6.git
 W:     http://www.linux-mtd.infradead.org/doc/ubifs.html
-S:     Maintained
+S:     Supported
 F:     Documentation/filesystems/ubifs.txt
 F:     fs/ubifs/
 
@@ -11231,7 +11419,6 @@ 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
@@ -11256,7 +11443,7 @@ F:      include/linux/mtd/ubi.h
 F:     include/uapi/mtd/ubi-user.h
 
 USB ACM DRIVER
-M:     Oliver Neukum <oliver@neukum.org>
+M:     Oliver Neukum <oneukum@suse.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
 F:     Documentation/usb/acm.txt
@@ -11341,6 +11528,13 @@ S:     Maintained
 F:     drivers/usb/host/isp116x*
 F:     include/linux/usb/isp116x.h
 
+USB LAN78XX ETHERNET DRIVER
+M:     Woojung Huh <woojung.huh@microchip.com>
+M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/usb/lan78xx.*
+
 USB MASS STORAGE DRIVER
 M:     Matthew Dharm <mdharm-usb@one-eyed-alien.net>
 L:     linux-usb@vger.kernel.org
@@ -11380,6 +11574,7 @@ M:      Valentina Manea <valentina.manea.m@gmail.com>
 M:     Shuah Khan <shuah.kh@samsung.com>
 L:     linux-usb@vger.kernel.org
 S:     Maintained
+F:     Documentation/usb/usbip_protocol.txt
 F:     drivers/usb/usbip/
 F:     tools/usb/usbip/
 
@@ -11785,14 +11980,14 @@ F:    Documentation/networking/vrf.txt
 
 VT1211 HARDWARE MONITOR DRIVER
 M:     Juerg Haefliger <juergh@gmail.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/vt1211
 F:     drivers/hwmon/vt1211.c
 
 VT8231 HARDWARE MONITOR DRIVER
 M:     Roger Lucas <vt8231@hiddenengine.co.uk>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/vt8231.c
 
@@ -11811,21 +12006,21 @@ F:    drivers/w1/
 
 W83791D HARDWARE MONITORING DRIVER
 M:     Marc Hulsman <m.hulsman@tudelft.nl>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/w83791d
 F:     drivers/hwmon/w83791d.c
 
 W83793 HARDWARE MONITORING DRIVER
 M:     Rudolf Marek <r.marek@assembler.cz>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     Documentation/hwmon/w83793
 F:     drivers/hwmon/w83793.c
 
 W83795 HARDWARE MONITORING DRIVER
 M:     Jean Delvare <jdelvare@suse.com>
-L:     lm-sensors@lm-sensors.org
+L:     linux-hwmon@vger.kernel.org
 S:     Maintained
 F:     drivers/hwmon/w83795.c
 
@@ -11870,6 +12065,18 @@ M:     David Härdeman <david@hardeman.nu>
 S:     Maintained
 F:     drivers/media/rc/winbond-cir.c
 
+WINSYSTEMS EBC-C384 WATCHDOG DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-watchdog@vger.kernel.org
+S:     Maintained
+F:     drivers/watchdog/ebc-c384_wdt.c
+
+WINSYSTEMS WS16C48 GPIO DRIVER
+M:     William Breathitt Gray <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-ws16c48.c
+
 WIMAX STACK
 M:     Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
 M:     linux-wimax@intel.com
Unnamed repository; edit this file 'description' to name the repository.