Merge tag 'iio-for-4.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio...

Jonathan writes:

First round of new IIO device support, features and cleanups for the 4.6 cycle.

Device Support
* ad5761
  - new driver
* at91_sama5d2 ADC.
  - new driver and MAINTAINERS entry.
  - minor cleanups followed.
* atlas pH-SM
  - new driver (this has possibly the prettiest data sheet I've ever seen)
* mcp3422
  - mcp3425 ADC added.
* mcp4725
  - mcp4726 DAC added.
* mma8452
  - mma8451q accelerometer added.
* mpl115
  - mpl115a1 added (a lot bigger than it seems as this is an SPI part whereas
    previous parts were i2c).
* si7005
  - Hoperf th02 (seems to be a repackaged part)
* si7020
  - Hoperf th06 (seems to be a repackaged part)

New features
* Core
  - IIO_PH type. Does what it says on the tin.
* max30100
  - LED current configuration support.
* mcp320x
  - more differential measurement combinations.
* mma8452
  - free fall deteciton
- opt3001
  - enable operation without a IRQ line.
  - device tree docs.  Somehow the original docs have disappeared down
    a rabbit hole, so here is a new set.
* st-sensors
  - Support active-low interrupts.

Cleanups and minor / not so minor reworks
* Documentation
  - drop some defunct ABI from the docs in staging.
* presure / Kconfig
  - white space cleanup.
* ad7150
  - BIT macro usage
  - Alignment fixes
* ad7192
  - false indent fixed.
* ak8975
  - constify the ak_def structures
* axp288
  - drop a redundant double const.
* dht11
  - substantial reliability improvements by being more tolerant
    of missing start bits.
  - simplify the decoding algorithm
* mma8452
  - whitespace cleanup
* mpl115
  - don't bother setting i2c_client_data as nothing uses it.
* mpu6050
  - drop unused function parameter.
* opt3001
  - extract integration time as constants.
  - trivial refactoring.

diff --combined CREDITS
index a3887b59b9f94dffce186079756b29d01fb7b91b,44ea433d70a1b40364f8daa933e7074e6eaf8e76..4312cd076b5b4306f2a799e4d12bb8db15f0f011
--- 1/CREDITS
--- 2/CREDITS
+++ b/CREDITS
@@@ -534,7 -534,6 +534,7 @@@ N: NeilBrow
  E: [email protected]
  P: 4096R/566281B9 1BC6 29EB D390 D870 7B5F  497A 39EC 9EDD 5662 81B9
  D: NFSD Maintainer 2000-2007
 +D: MD Maintainer 2001-2016
  
  N: Zach Brown
  E: [email protected]
@@@ -1508,14 -1507,6 +1508,14 @@@ S: 312/107 Canberra Avenu
  S: Griffith, ACT 2603 
  S: Australia
  
 +N: Andreas Herrmann
 +E: [email protected]
 +E: [email protected]
 +D: Key developer of x86/AMD64
 +D: Author of AMD family 15h processor power monitoring driver
 +D: Maintainer of AMD Athlon 64 and Opteron processor frequency driver
 +S: Germany
 +
  N: Sebastian Hetze
  E: [email protected]
  D: German Linux Documentation,
@@@ -1856,16 -1847,6 +1856,16 @@@ S: Korte Heul 9
  S: 1403 ND  BUSSUM
  S: The Netherlands
  
 +N: Martin Kepplinger
 +E: [email protected]
 +E: [email protected]
 +W: http://www.martinkepplinger.com
 +D: mma8452 accelerators iio driver
 +D: Kernel cleanups
 +S: Garnisonstraße 26
 +S: 4020 Linz
 +S: Austria
 +
  N: Karl Keyte
  E: [email protected]
  D: Disk usage statistics and modifications to line printer driver
@@@ -3054,6 -3035,7 +3054,7 @@@ D: PLX USB338x drive
  D: PCA9634 driver
  D: Option GTM671WFS
  D: Fintek F81216A
+ D: AD5761 iio driver
  D: Various kernel hacks
  S: Qtechnology A/S
  S: Valby Langgade 142

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 72e2c5a2b3278facb20378383cbb63baa6485e0f,cd5180b4e477e75033a4ce263b521cbe21dc9cf4..44ddc980b085a7119c33f6061c345dba3eb57d81
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -28,12 -28,12 +28,13 @@@ arm        ARM Ltd
  armadeus      ARMadeus Systems SARL
  artesyn       Artesyn Embedded Technologies Inc.
  asahi-kasei   Asahi Kasei Corp.
+ atlas Atlas Scientific LLC
  atmel Atmel Corporation
  auo   AU Optronics Corporation
  avago Avago Technologies
  avic  Shanghai AVIC Optoelectronics Co., Ltd.
  axis  Axis Communications AB
 +boe   BOE Technology Group Co., Ltd.
  bosch Bosch Sensortec GmbH
  boundary      Boundary Devices Inc.
  brcm  Broadcom Corporation
@@@ -124,8 -124,6 +125,8 @@@ jedec      JEDEC Solid State Technology Asso
  karo  Ka-Ro electronics GmbH
  keymile       Keymile GmbH
  kinetic Kinetic Technologies
 +kosagi        Sutajio Ko-Usagi PTE Ltd.
 +kyo   Kyocera Corporation
  lacie LaCie
  lantiq        Lantiq Semiconductor
  lenovo        Lenovo Group Ltd.
@@@ -164,7 -162,6 +165,7 @@@ nuvoton    Nuvoton Technology Corporatio
  nvidia        NVIDIA
  nxp   NXP Semiconductors
  okaya Okaya Electric America, Inc.
 +olimex        OLIMEX Ltd.
  onnn  ON Semiconductor Corp.
  opencores     OpenCores.org
  option        Option NV
@@@ -184,7 -181,6 +185,7 @@@ qca        Qualcomm Atheros, Inc
  qcom  Qualcomm Technologies, Inc
  qemu  QEMU, a generic and open source machine emulator and virtualizer
  qi    Qi Hardware
 +qiaodian      QiaoDian XianShi Corporation
  qnap  QNAP Systems, Inc.
  radxa Radxa
  raidsonic     RaidSonic Technology GmbH
@@@ -223,13 -219,11 +224,13 @@@ sony    Sony Corporatio
  spansion      Spansion Inc.
  sprd  Spreadtrum Communications Inc.
  st    STMicroelectronics
 +startek       Startek
  ste   ST-Ericsson
  stericsson    ST-Ericsson
  synology      Synology, Inc.
  tbs   TBS Technologies
  tcl   Toby Churchill Ltd.
 +technologic   Technologic Systems
  thine THine Electronics, Inc.
  ti    Texas Instruments
  tlm   Trusted Logic Mobility
@@@ -245,7 -239,6 +246,7 @@@ v3 V3 Semiconducto
  variscite     Variscite Ltd.
  via   VIA Technologies, Inc.
  virtio        Virtual I/O Device Specification, developed by the OASIS consortium
 +vivante       Vivante Corporation
  voipac        Voipac Technologies s.r.o.
  wexler        Wexler
  winbond Winbond Electronics corp.

diff --combined MAINTAINERS
index 79f7eb25ecd89c466286358b6c6f14e3112a6022,6ddb488d78f6b0db2b9eb05391ec744ac8b95f8b..369f6aefc18985e9279a412b922725dc0eca4edf
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -206,7 -206,7 +206,7 @@@ F: include/trace/events/9p.
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -240,12 -240,6 +240,12 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/hwmon/abituguru3.c
  
 +ACCES 104-IDI-48 GPIO DRIVER
 +M:    "William Breathitt Gray" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-104-idi-48.c
 +
  ACCES 104-IDIO-16 GPIO DRIVER
  M:    "William Breathitt Gray" <[email protected]>
  L:    [email protected]
@@@ -377,15 -371,6 +377,15 @@@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASL
  M:    Jiri Kosina <[email protected]>
  S:    Maintained
  
 +ADF7242 IEEE 802.15.4 RADIO DRIVER
 +M:    Michael Hennerich <[email protected]>
 +W:    https://wiki.analog.com/ADF7242
 +W:    http://ez.analog.com/community/linux-device-drivers
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ieee802154/adf7242.c
 +F:    Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
 +
  ADM1025 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <[email protected]>
  L:    [email protected]
@@@ -403,14 -388,14 +403,14 @@@ ADM8211 WIRELESS DRIVE
  L:    [email protected]
  W:    http://wireless.kernel.org/
  S:    Orphan
 -F:    drivers/net/wireless/adm8211.*
 +F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
  M:    Sakari Ailus <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/adp1653.c
 -F:    include/media/adp1653.h
 +F:    include/media/i2c/adp1653.h
  
  ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
  M:    Michael Hennerich <[email protected]>
@@@ -481,7 -466,7 +481,7 @@@ F: sound/oss/aedsp16.
  AF9013 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -491,7 -476,7 +491,7 @@@ F: drivers/media/dvb-frontends/af9013
  AF9033 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -537,7 -522,7 +537,7 @@@ AIMSLAB FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-aimslab*
  
@@@ -551,7 -536,7 +551,7 @@@ F: include/linux/*aio*.
  AIRSPY MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -629,9 -614,9 +629,9 @@@ F: drivers/crypto/ccp
  F:    include/linux/ccp.h
  
  AMD FAM15H PROCESSOR POWER MONITORING DRIVER
 -M:    Andreas Herrmann <herrmann.der.user@googlemail.com>
 +M:    Huang Rui <ray.huang@amd.com>
  L:    [email protected]
 -S:    Maintained
 +S:    Supported
  F:    Documentation/hwmon/fam15h_power
  F:    drivers/hwmon/fam15h_power.c
  
@@@ -781,7 -766,6 +781,7 @@@ F: sound/aoa
  APM DRIVER
  M:    Jiri Kosina <[email protected]>
  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 -931,6 +947,7 @@@ M: Alexandre Belloni <alexandre.belloni
  M:    Jean-Christophe Plagniol-Villard <[email protected]>
  L:    [email protected] (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/
@@@ -1417,13 -1400,12 +1417,13 @@@ W:   http://www.arm.linux.org.uk
  S:    Maintained
  
  ARM/QUALCOMM SUPPORT
 -M:    Kumar Gala <[email protected]>
 -M:    Andy Gross <[email protected]>
 -M:    David Brown <[email protected]>
 +M:    Andy Gross <[email protected]>
 +M:    David Brown <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    arch/arm/boot/dts/qcom-*.dts
 +F:    arch/arm/boot/dts/qcom-*.dtsi
  F:    arch/arm/mach-qcom/
  F:    drivers/soc/qcom/
  F:    drivers/tty/serial/msm_serial.h
@@@ -1431,22 -1413,13 +1431,22 @@@ F:   drivers/tty/serial/msm_serial.
  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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  
 +ARM/RENESAS ARM64 ARCHITECTURE
 +M:    Simon Horman <[email protected]>
 +M:    Magnus Damm <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1466,7 -1439,6 +1466,7 @@@ ARM/Rockchip SoC suppor
  M:    Heiko Stuebner <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
 +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/
@@@ -1544,8 -1516,9 +1544,8 @@@ F:      drivers/media/platform/s5p-jpeg
  ARM/SHMOBILE ARM ARCHITECTURE
  M:    Simon Horman <[email protected]>
  M:    Magnus Damm <[email protected]>
 -L:    [email protected]
 -W:    http://oss.renesas.com
 -Q:    http://patchwork.kernel.org/project/linux-sh/list/
 +L:    [email protected]
 +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*
@@@ -1615,13 -1588,6 +1615,13 @@@ T:    git git://git.kernel.org/pub/scm/lin
  N:    stm32
  F:    drivers/clocksource/armv7m_systick.c
  
 +ARM/TANGO ARCHITECTURE
 +M:    Marc Gonzalez <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/arm/mach-tango/
 +F:    arch/arm/boot/dts/tango*
 +
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -1676,8 -1642,6 +1676,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
@@@ -1799,7 -1763,6 +1799,7 @@@ ARM64 PORT (AARCH64 ARCHITECTURE
  M:    Catalin Marinas <[email protected]>
  M:    Will Deacon <[email protected]>
  L:    [email protected] (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/
@@@ -1810,7 -1773,7 +1810,7 @@@ L:      [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/as3645a.c
 -F:    include/media/as3645a.h
 +F:    include/media/i2c/as3645a.h
  
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <[email protected]>
@@@ -1828,12 -1791,6 +1828,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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/asus-wireless.c
 +
  ASYNCHRONOUS TRANSFERS/TRANSFORMS (IOAT) API
  R:    Dan Williams <[email protected]>
  W:    http://sourceforge.net/projects/xscaleiop
@@@ -1885,7 -1842,7 +1885,7 @@@ ATHEROS ATH6KL WIRELESS DRIVE
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
  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/
  
@@@ -1939,12 -1896,19 +1939,18 @@@ ATMEL AT91 / AT32 MCI DRIVE
  M:    Ludovic Desroches <[email protected]>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
 -F:    drivers/mmc/host/atmel-mci-regs.h
  
  ATMEL AT91 / AT32 SERIAL DRIVER
  M:    Nicolas Ferre <[email protected]>
  S:    Supported
  F:    drivers/tty/serial/atmel_serial.c
  
+ ATMEL SAMA5D2 ADC DRIVER
+ M:    Ludovic Desroches <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/iio/adc/at91-sama5d2_adc.c
+ 
  ATMEL Audio ALSA driver
  M:    Nicolas Ferre <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -2035,7 -1999,7 +2041,7 @@@ L:      [email protected]
  W:    http://www.thekelleys.org.uk/atmel
  W:    http://atmelwlandriver.sourceforge.net/
  S:    Maintained
 -F:    drivers/net/wireless/atmel*
 +F:    drivers/net/wireless/atmel/atmel*
  
  ATMEL MAXTOUCH DRIVER
  M:    Nick Dyer <[email protected]>
@@@ -2106,7 -2070,7 +2112,7 @@@ F:      net/ax25
  AZ6007 DVB DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/az6007.c
@@@ -2115,7 -2079,7 +2121,7 @@@ AZTECH FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-aztech*
  
@@@ -2124,7 -2088,7 +2130,7 @@@ L:      [email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/b43
  S:    Odd Fixes
 -F:    drivers/net/wireless/b43/
 +F:    drivers/net/wireless/broadcom/b43/
  
  B43LEGACY WIRELESS DRIVER
  M:    Larry Finger <[email protected]>
@@@ -2132,12 -2096,11 +2138,12 @@@ L:   [email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/b43
  S:    Maintained
 -F:    drivers/net/wireless/b43legacy/
 +F:    drivers/net/wireless/broadcom/b43legacy/
  
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Jingoo Han <[email protected]>
  M:    Lee Jones <[email protected]>
 +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
@@@ -2145,7 -2108,7 +2151,7 @@@
  BATMAN ADVANCED
  M:    Marek Lindner <[email protected]>
  M:    Simon Wunderlich <[email protected]>
 -M:    Antonio Quartulli <a[email protected]>
 +M:    Antonio Quartulli <a@unstable.cc>
  L:    [email protected]
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -2169,7 -2132,7 +2175,7 @@@ BDISP ST MEDIA DRIVE
  M:    Fabien Dessenne <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Supported
  F:    drivers/media/platform/sti/bdisp
  
@@@ -2400,7 -2363,6 +2406,7 @@@ M:      Brian Norris <computersforpeace@gmai
  M:    Gregory Fong <[email protected]>
  M:    Florian Fainelli <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
  T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/*brcmstb*
@@@ -2420,8 -2382,6 +2426,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 <[email protected]>
@@@ -2438,7 -2398,7 +2444,7 @@@ M:      Hante Meuleman <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/wireless/brcm80211/
 +F:    drivers/net/wireless/broadcom/brcm80211/
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
  M:    [email protected]
@@@ -2476,7 -2436,7 +2482,7 @@@ N:      bcm8831
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Gregory Fong <[email protected]>
 -L:    [email protected]>
 +L:    [email protected]
  S:    Supported
  F:    drivers/gpio/gpio-brcmstb.c
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
@@@ -2565,7 -2525,7 +2571,7 @@@ F:      fs/btrfs
  BTTV VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/bttv/
@@@ -2604,7 -2564,7 +2610,7 @@@ CADET FM/AM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-cadet*
  
@@@ -2738,11 -2698,10 +2744,11 @@@ F:   fs/ceph
  CERTIFICATE HANDLING:
  M:    David Howells <[email protected]>
  M:    David Woodhouse <[email protected]>
 -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:
@@@ -2806,7 -2765,7 +2812,7 @@@ S:      Maintaine
  F:    Documentation/zh_CN/
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
 -M:    Peter Chen <Peter.Chen@freescale.com>
 +M:    Peter Chen <Peter.Chen@nxp.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  L:    [email protected]
  S:    Maintained
@@@ -2822,7 -2781,6 +2828,7 @@@ F:      drivers/input/touchscreen/chipone_ic
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Olof Johansson <[email protected]>
  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
@@@ -2899,7 -2857,7 +2905,7 @@@ COBALT MEDIA DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Supported
  F:    drivers/media/pci/cobalt/
  
@@@ -2987,8 -2945,7 +2993,8 @@@ F:      drivers/usb/atm/cxacru.
  
  CONFIGFS
  M:    Joel Becker <[email protected]>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git
 +M:    Christoph Hellwig <[email protected]>
 +T:    git git://git.infradead.org/users/hch/configfs.git
  S:    Supported
  F:    fs/configfs/
  F:    include/linux/configfs.h
@@@ -3121,7 -3078,6 +3127,7 @@@ M:      Mikael Starvik <[email protected]
  M:    Jesper Nilsson <[email protected]>
  L:    [email protected]
  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.*
@@@ -3130,7 -3086,6 +3136,7 @@@ CRYPTO AP
  M:    Herbert Xu <[email protected]>
  M:    "David S. Miller" <[email protected]>
  L:    [email protected]
 +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/
@@@ -3147,15 -3102,6 +3153,15 @@@ S:    Maintaine
  F:    crypto/ansi_cprng.c
  F:    crypto/rng.c
  
 +CS3308 MEDIA DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/i2c/cs3308.c
 +F:    drivers/media/i2c/cs3308.h
 +
  CS5535 Audio ALSA driver
  M:    Jaya Kumar <[email protected]>
  S:    Maintained
@@@ -3164,14 -3110,14 +3170,14 @@@ F:   sound/pci/cs5535audio
  CW1200 WLAN driver
  M:    Solomon Peachy <[email protected]>
  S:    Maintained
 -F:    drivers/net/wireless/cw1200/
 +F:    drivers/net/wireless/st/cw1200/
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  W:    http://www.ivtvdriver.org/index.php/Cx18
  S:    Maintained
  F:    Documentation/video4linux/cx18.txt
@@@ -3182,7 -3128,7 +3188,7 @@@ CX2341X MPEG ENCODER HELPER MODUL
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/common/cx2341x*
  F:    include/media/cx2341x*
@@@ -3191,7 -3137,7 +3197,7 @@@ CX24120 MEDIA DRIVE
  M:    Jemma Denson <[email protected]>
  M:    Patrick Boettcher <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/cx24120*
@@@ -3199,7 -3145,7 +3205,7 @@@
  CX88 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/cx88/
@@@ -3208,7 -3154,7 +3214,7 @@@ F:      drivers/media/pci/cx88
  CXD2820R MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3314,7 -3260,7 +3320,7 @@@ F:      drivers/net/wan/pc300
  CYPRESS_FIRMWARE MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3463,21 -3409,8 +3469,21 @@@ DEVICE FREQUENCY (DEVFREQ
  M:    MyungJoo Ham <[email protected]>
  M:    Kyungmin Park <[email protected]>
  L:    [email protected]
 +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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
@@@ -3538,6 -3471,13 +3544,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/staging/dgnc/
  
 -DIGI EPCA PCI PRODUCTS
 -M:    Lidza Louina <[email protected]>
 -M:    Daeseok Youn <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/staging/dgap/
 -
  DIOLAN U2C-12 I2C DRIVER
  M:    Guenter Roeck <[email protected]>
  L:    [email protected]
@@@ -3586,7 -3526,7 +3592,7 @@@ M:      Christine Caulfield <ccaulfie@redhat
  M:    David Teigland <[email protected]>
  L:    [email protected]
  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/
  
@@@ -3660,12 -3600,13 +3666,12 @@@ F:   drivers/scsi/dpt
  F:    drivers/scsi/dpt/
  
  DRBD DRIVER
 -P:    Philipp Reisner
 -P:    Lars Ellenberg
 -M:    [email protected]
 -L:    [email protected]
 +M:    Philipp Reisner <[email protected]>
 +M:    Lars Ellenberg <[email protected]>
 +L:    [email protected]
  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
@@@ -3786,7 -3727,7 +3792,7 @@@ F:      Documentation/devicetree/bindings/di
  DRM DRIVERS FOR RENESAS
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
 -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/
@@@ -3809,15 -3750,6 +3815,15 @@@ S:    Maintaine
  F:    drivers/gpu/drm/sti
  F:    Documentation/devicetree/bindings/display/st,stih4xx.txt
  
 +DRM DRIVERS FOR VIVANTE GPU IP
 +M:    Lucas Stach <[email protected]>
 +R:    Russell King <[email protected]>
 +R:    Christian Gmeiner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpu/drm/etnaviv
 +F:    Documentation/devicetree/bindings/display/etnaviv
 +
  DSBR100 USB FM RADIO DRIVER
  M:    Alexey Klimov <[email protected]>
  L:    [email protected]
@@@ -3835,14 -3767,14 +3841,14 @@@ DT3155 MEDIA DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/pci/dt3155/
  
  DVB_USB_AF9015 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3852,7 -3784,7 +3858,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9015
  DVB_USB_AF9035 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3862,7 -3794,7 +3868,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9035
  DVB_USB_ANYSEE MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3872,7 -3804,7 +3878,7 @@@ F:      drivers/media/usb/dvb-usb-v2/anysee
  DVB_USB_AU6610 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3882,7 -3814,7 +3888,7 @@@ F:      drivers/media/usb/dvb-usb-v2/au6610
  DVB_USB_CE6230 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3892,7 -3824,7 +3898,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ce6230
  DVB_USB_CXUSB MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/media_tree.git
@@@ -3902,7 -3834,7 +3908,7 @@@ F:      drivers/media/usb/dvb-usb/cxusb
  DVB_USB_EC168 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3912,7 -3844,7 +3918,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ec168
  DVB_USB_GL861 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/anttip/media_tree.git
  S:    Maintained
@@@ -3921,7 -3853,7 +3927,7 @@@ F:      drivers/media/usb/dvb-usb-v2/gl861
  DVB_USB_MXL111SF MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/mxl111sf.git
@@@ -3931,7 -3863,7 +3937,7 @@@ F:      drivers/media/usb/dvb-usb-v2/mxl111s
  DVB_USB_RTL28XXU MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3941,7 -3873,7 +3947,7 @@@ F:      drivers/media/usb/dvb-usb-v2/rtl28xx
  DVB_USB_V2 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3971,7 -3903,7 +3977,7 @@@ F:      Documentation/devicetree/bindings/in
  E4000 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3987,7 -3919,7 +3993,7 @@@ F:      drivers/scsi/eata.
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -3999,7 -3931,6 +4005,7 @@@ M:      Tyler Hicks <[email protected]
  L:    [email protected]
  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/
@@@ -4009,8 -3940,9 +4015,8 @@@ M:      Doug Thompson <dougthompson@xmission
  M:    Borislav Petkov <[email protected]>
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
 -T:    git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
 -T:    git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next
  S:    Supported
  F:    Documentation/edac.txt
  F:    drivers/edac/
@@@ -4020,6 -3952,7 +4026,6 @@@ EDAC-AMD6
  M:    Doug Thompson <[email protected]>
  M:    Borislav Petkov <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
@@@ -4027,6 -3960,7 +4033,6 @@@ EDAC-CALXED
  M:    Doug Thompson <[email protected]>
  M:    Robert Richter <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/highbank*
  
@@@ -4035,6 -3969,7 +4041,6 @@@ M:      Ralf Baechle <[email protected]
  M:    David Daney <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
@@@ -4042,54 -3977,63 +4048,54 @@@ EDAC-E752
  M:    Mark Gross <[email protected]>
  M:    Doug Thompson <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
  
  EDAC-E7XXX
  M:    Doug Thompson <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e7xxx_edac.c
  
  EDAC-GHES
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
  EDAC-I82443BXGX
  M:    Tim Small <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82443bxgx_edac.c
  
  EDAC-I3000
  M:    Jason Uhlenkott <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i3000_edac.c
  
  EDAC-I5000
  M:    Doug Thompson <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
  
@@@ -4097,36 -4041,42 +4103,36 @@@ EDAC-I82975
  M:    Ranganathan Desikan <[email protected]>
  M:    "Arvind R." <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82975x_edac.c
  
  EDAC-IE31200
  M:    Jason Baron <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/ie31200_edac.c
  
  EDAC-MPC85XX
  M:    Johannes Thumshirn <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/mpc85xx_edac.[ch]
  
  EDAC-PASEMI
  M:    Egor Martovetsky <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/pasemi_edac.c
  
  EDAC-R82600
  M:    Tim Small <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
@@@ -4193,7 -4143,7 +4199,7 @@@ F:      drivers/net/ethernet/ibm/ehea
  EM28XX VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/em28xx/
@@@ -4278,7 -4228,6 +4284,7 @@@ M:      Andreas Dilger <adilger.kernel@dilge
  L:    [email protected]
  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/
@@@ -4334,7 -4283,7 +4340,7 @@@ F:      drivers/media/tuners/fc0011.
  FC2580 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -4548,9 -4497,8 +4554,9 @@@ F:      include/linux/fs_enet_pd.
  FREESCALE QUICC ENGINE LIBRARY
  L:    [email protected]
  S:    Orphan
 -F:    arch/powerpc/sysdev/qe_lib/
 -F:    arch/powerpc/include/asm/*qe.h
 +F:    drivers/soc/fsl/qe/
 +F:    include/soc/fsl/*qe*.h
 +F:    include/soc/fsl/*ucc*.h
  
  FREESCALE USB PERIPHERAL DRIVERS
  M:    Li Yang <[email protected]>
@@@ -4642,7 -4590,8 +4648,7 @@@ F:      include/linux/f2fs_fs.
  F:    include/trace/events/f2fs.h
  
  FUJITSU FR-V (FRV) PORT
 -M:    David Howells <[email protected]>
 -S:    Maintained
 +S:    Orphan
  F:    arch/frv/
  
  FUJITSU LAPTOP EXTRAS
@@@ -4657,7 -4606,7 +4663,7 @@@ M:      Heungjun Kim <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/m5mols/
 -F:    include/media/m5mols.h
 +F:    include/media/i2c/m5mols.h
  
  FUJITSU TABLET EXTRAS
  M:    Robert Gerlach <[email protected]>
@@@ -4703,7 -4652,7 +4709,7 @@@ GEMTEK FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-gemtek*
  
@@@ -4911,7 -4860,7 +4917,7 @@@ HDPVR USB VIDEO ENCODER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/usb/hdpvr/
  
@@@ -4930,7 -4879,7 +4936,7 @@@ F:      drivers/tty/hvc
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -4961,7 -4910,6 +4967,7 @@@ F:      include/linux/hw_random.
  HARDWARE SPINLOCK CORE
  M:    Ohad Ben-Cohen <[email protected]>
  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
@@@ -4974,7 -4922,7 +4980,7 @@@ F:      sound/parisc/harmony.
  HD29L2 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -5043,7 -4991,6 +5049,7 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <[email protected]>
 +R:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -5098,20 -5045,13 +5104,20 @@@ F:   include/uapi/linux/if_hippi.
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
 +HISILICON SAS Controller
 +M:    John Garry <[email protected]>
 +W:    http://www.hisilicon.com
 +S:    Supported
 +F:    drivers/scsi/hisi_sas/
 +F:    Documentation/devicetree/bindings/scsi/hisilicon-sas.txt
 +
  HOST AP DRIVER
  M:    Jouni Malinen <[email protected]>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  W:    http://hostap.epitest.fi/
  S:    Maintained
 -F:    drivers/net/wireless/hostap/
 +F:    drivers/net/wireless/intersil/hostap/
  
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
  L:    [email protected]
@@@ -5349,13 -5289,6 +5355,13 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
 +IBM Power SRIOV Virtual NIC Device Driver
 +M:    Thomas Falcon <[email protected]>
 +M:    John Allen <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/ethernet/ibm/ibmvnic.*
 +
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <[email protected]>
  L:    [email protected]
@@@ -5500,7 -5433,6 +5506,7 @@@ M:      Dmitry Kasatkin <dmitry.kasatkin@gma
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
  S:    Supported
  F:    security/integrity/ima/
  
@@@ -5576,12 -5508,6 +5582,12 @@@ T:    git git://git.code.sf.net/p/intel-sa
  S:    Supported
  F:    drivers/scsi/isci/
  
 +INTEL HID EVENT DRIVER
 +M:    Alex Hung <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/intel-hid.c
 +
  INTEL IDLE DRIVER
  M:    Len Brown <[email protected]>
  L:    [email protected]
@@@ -5658,7 -5584,7 +5664,7 @@@ R:      Jesse Brandeburg <jesse.brandeburg@i
  R:    Shannon Nelson <[email protected]>
  R:    Carolyn Wyborny <[email protected]>
  R:    Don Skidmore <[email protected]>
 -R:    Matthew Vick <matthew.vick@intel.com>
 +R:    Bruce Allan <bruce.w.allan@intel.com>
  R:    John Ronciak <[email protected]>
  R:    Mitch Williams <[email protected]>
  L:    [email protected]
@@@ -5693,7 -5619,7 +5699,7 @@@ L:      [email protected]
  S:    Maintained
  F:    Documentation/networking/README.ipw2100
  F:    Documentation/networking/README.ipw2200
 -F:    drivers/net/wireless/ipw2x00/
 +F:    drivers/net/wireless/intel/ipw2x00/
  
  INTEL(R) TRACE HUB
  M:    Alexander Shishkin <[email protected]>
@@@ -5702,7 -5628,9 +5708,7 @@@ F:      Documentation/trace/intel_th.tx
  F:    drivers/hwtracing/intel_th/
  
  INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 -M:    Richard L Maliszewski <[email protected]>
 -M:    Gang Wei <[email protected]>
 -M:    Shane Wang <[email protected]>
 +M:    Ning Sun <[email protected]>
  L:    [email protected]
  W:    http://tboot.sourceforge.net
  T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
@@@ -5725,7 -5653,7 +5731,7 @@@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwl
  M:    Stanislaw Gruszka <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    drivers/net/wireless/iwlegacy/
 +F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <[email protected]>
@@@ -5735,7 -5663,7 +5741,7 @@@ L:      [email protected]
  W:    http://intellinuxwireless.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
  S:    Supported
 -F:    drivers/net/wireless/iwlwifi/
 +F:    drivers/net/wireless/intel/iwlwifi/
  
  INTEL MANAGEMENT ENGINE (mei)
  M:    Tomas Winkler <[email protected]>
@@@ -5756,27 -5684,18 +5762,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<[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/x86/include/asm/intel_telemetry.h
 +F:    drivers/platform/x86/intel_telemetry*
  
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <[email protected]>
@@@ -5839,8 -5758,6 +5845,8 @@@ M:      Julian Anastasov <[email protected]
  L:    [email protected]
  L:    [email protected]
  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
@@@ -5911,7 -5828,7 +5917,7 @@@ ISA RADIO MODUL
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-isa*
  
@@@ -5981,7 -5898,7 +5987,7 @@@ F:      drivers/hwmon/it87.
  IT913X MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -6002,7 -5919,7 +6008,7 @@@ F:      include/uapi/linux/ivtv
  IX2505V MEDIA DRIVER
  M:    Malcolm Priestley <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/ix2505v*
@@@ -6091,7 -6008,7 +6097,7 @@@ KEENE FM RADIO TRANSMITTER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-keene*
  
@@@ -6124,7 -6041,6 +6130,7 @@@ M:      "J. Bruce Fields" <bfields@fieldses.
  M:    Jeff Layton <[email protected]>
  L:    [email protected]
  W:    http://nfs.sourceforge.net/
 +T:    git git://linux-nfs.org/~bfields/linux.git
  S:    Supported
  F:    fs/nfsd/
  F:    include/uapi/linux/nfsd/
@@@ -6181,7 -6097,6 +6187,7 @@@ M:      Christian Borntraeger <borntraeger@d
  M:    Cornelia Huck <[email protected]>
  L:    [email protected]
  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*
@@@ -6193,7 -6108,6 +6199,7 @@@ M:      Marc Zyngier <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  W:    http://systems.cs.columbia.edu/projects/kvm-arm
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
  S:    Supported
  F:    arch/arm/include/uapi/asm/kvm*
  F:    arch/arm/include/asm/kvm*
@@@ -6211,14 -6125,6 +6217,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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/mips/include/uapi/asm/kvm*
 +F:    arch/mips/include/asm/kvm*
 +F:    arch/mips/kvm/
 +
  KEXEC
  M:    Eric Biederman <[email protected]>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -6263,7 -6169,6 +6269,7 @@@ KGDB / KDB /debug_cor
  M:    Jason Wessel <[email protected]>
  W:    http://kgdb.wiki.kernel.org/
  L:    [email protected]
 +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
@@@ -6316,12 -6221,6 +6322,12 @@@ S:    Maintaine
  F:    net/l3mdev
  F:    include/net/l3mdev.h
  
 +LANTIQ MIPS ARCHITECTURE
 +M:    John Crispin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/lantiq
 +
  LAPB module
  L:    [email protected]
  S:    Orphan
@@@ -6361,7 -6260,7 +6367,7 @@@ F:      drivers/usb/misc/legousbtower.
  LG2160 MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -6371,7 -6270,7 +6377,7 @@@ F:      drivers/media/dvb-frontends/lg2160.
  LGDT3305 MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -6441,7 -6340,6 +6447,7 @@@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE S
  M:    Dan Williams <[email protected]>
  L:    [email protected]
  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
@@@ -6539,7 -6437,7 +6545,7 @@@ S:      Maintaine
  F:    arch/powerpc/platforms/8xx/
  
  LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
 -M:    Scott Wood <[email protected]>
 +M:    Scott Wood <[email protected]>
  M:    Kumar Gala <[email protected]>
  W:    http://www.penguinppc.org/
  L:    [email protected]
@@@ -6629,7 -6527,7 +6635,7 @@@ F:      drivers/hwmon/lm95234.
  LME2510 MEDIA DRIVER
  M:    Malcolm Priestley <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/lmedm04*
@@@ -6735,7 -6633,7 +6741,7 @@@ F:      arch/m68k/hp300
  M88DS3103 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -6745,7 -6643,7 +6751,7 @@@ F:      drivers/media/dvb-frontends/m88ds310
  M88RS2000 MEDIA DRIVER
  M:    Malcolm Priestley <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/m88rs2000*
@@@ -6816,7 -6714,7 +6822,7 @@@ F:      drivers/net/ethernet/marvell/sk
  MARVELL LIBERTAS WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -F:    drivers/net/wireless/libertas/
 +F:    drivers/net/wireless/marvell/libertas/
  
  MARVELL MV643XX ETHERNET DRIVER
  M:    Sebastian Hesselbarth <[email protected]>
@@@ -6836,13 -6734,13 +6842,13 @@@ M:   Amitkumar Karwar <[email protected]
  M:    Nishant Sarmukadam <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/wireless/mwifiex/
 +F:    drivers/net/wireless/marvell/mwifiex/
  
  MARVELL MWL8K WIRELESS DRIVER
  M:    Lennert Buytenhek <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -F:    drivers/net/wireless/mwl8k.c
 +F:    drivers/net/wireless/marvell/mwl8k.c
  
  MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
  M:    Nicolas Pitre <[email protected]>
@@@ -6924,7 -6822,7 +6930,7 @@@ MAXIRADIO FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-maxiradio*
  
@@@ -6937,7 -6835,7 +6943,7 @@@ F:      drivers/iio/potentiometer/mcp4531.
  MEDIA DRIVERS FOR RENESAS - VSP1
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
 -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
@@@ -6946,7 -6844,7 +6952,7 @@@ F:      drivers/media/platform/vsp1
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6955,7 -6853,7 +6961,7 @@@ F:      drivers/media/dvb-frontends/ascot2e
  MEDIA DRIVERS FOR CXD2841ER
  M:    Sergey Kozlov <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6964,7 -6862,7 +6970,7 @@@ F:      drivers/media/dvb-frontends/cxd2841e
  MEDIA DRIVERS FOR HORUS3A
  M:    Sergey Kozlov <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6973,7 -6871,7 +6979,7 @@@ F:      drivers/media/dvb-frontends/horus3a
  MEDIA DRIVERS FOR LNBH25
  M:    Sergey Kozlov <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6982,7 -6880,7 +6988,7 @@@ F:      drivers/media/dvb-frontends/lnbh25
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
  M:    Sergey Kozlov <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6992,7 -6890,7 +6998,7 @@@ MEDIA INPUT INFRASTRUCTURE (V4L/DVB
  M:    Mauro Carvalho Chehab <[email protected]>
  P:    LinuxTV.org Project
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  Q:    http://patchwork.kernel.org/project/linux-media/list/
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
@@@ -7001,7 -6899,6 +7007,7 @@@ F:      Documentation/video4linux
  F:    Documentation/DocBook/media/
  F:    drivers/media/
  F:    drivers/staging/media/
 +F:    include/linux/platform_data/media/
  F:    include/media/
  F:    include/uapi/linux/dvb/
  F:    include/uapi/linux/videodev2.h
@@@ -7111,7 -7008,6 +7117,7 @@@ F:      Documentation/hwmon/menf21bm
  METAG ARCHITECTURE
  M:    James Hogan <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
  S:    Odd Fixes
  F:    arch/metag/
  F:    Documentation/metag/
@@@ -7154,49 -7050,31 +7160,49 @@@ MIROSOUND PCM20 FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  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:    [email protected]
  L:    [email protected]
  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 <[email protected]>
 +L:    [email protected]
 +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 <[email protected]>
 +M:    Leon Romanovsky <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +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 <[email protected]>
 +MELLANOX MLX5 IB driver
 +M:    Matan Barak <[email protected]>
 +M:    Leon Romanovsky <[email protected]>
  L:    [email protected]
  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 <[email protected]>
@@@ -7208,7 -7086,7 +7214,7 @@@ F:      drivers/iio/temperature/mlx90614.
  MN88472 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -7219,7 -7097,7 +7225,7 @@@ F:      drivers/media/dvb-frontends/mn88472.
  MN88473 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -7274,7 -7152,7 +7280,7 @@@ F:      drivers/platform/x86/msi-wmi.
  MSI001 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -7284,7 -7162,7 +7290,7 @@@ F:      drivers/media/tuners/msi001
  MSI2500 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -7303,7 -7181,7 +7309,7 @@@ L:      [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/mt9m032.c
 -F:    include/media/mt9m032.h
 +F:    include/media/i2c/mt9m032.h
  
  MT9P031 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
@@@ -7311,7 -7189,7 +7317,7 @@@ L:      [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/mt9p031.c
 -F:    include/media/mt9p031.h
 +F:    include/media/i2c/mt9p031.h
  
  MT9T001 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
@@@ -7319,7 -7197,7 +7325,7 @@@ L:      [email protected]
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/i2c/mt9t001.c
 -F:    include/media/mt9t001.h
 +F:    include/media/i2c/mt9t001.h
  
  MT9V032 APTINA CAMERA SENSOR
  M:    Laurent Pinchart <[email protected]>
@@@ -7328,7 -7206,7 +7334,7 @@@ T:      git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    Documentation/devicetree/bindings/media/i2c/mt9v032.txt
  F:    drivers/media/i2c/mt9v032.c
 -F:    include/media/mt9v032.h
 +F:    include/media/i2c/mt9v032.h
  
  MULTIFUNCTION DEVICES (MFD)
  M:    Lee Jones <[email protected]>
@@@ -7372,7 -7250,7 +7378,7 @@@ F:      drivers/usb/musb
  MXL5007T MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -7497,13 -7375,6 +7503,13 @@@ F:    include/net/netrom.
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
  
 +NETRONOME ETHERNET DRIVERS
 +M:    Jakub Kicinski <[email protected]>
 +M:    Rolf Neugebauer <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/ethernet/netronome/
 +
  NETWORK BLOCK DEVICE (NBD)
  M:    Markus Pargmann <[email protected]>
  S:    Maintained
@@@ -7611,8 -7482,7 +7617,8 @@@ NETWORKING DRIVERS (WIRELESS
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
  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/
  
@@@ -7636,12 -7506,7 +7642,12 @@@ 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
 +F:    include/linux/platform_data/st21nfca.h
 +F:    include/linux/platform_data/st-nci.h
  F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
@@@ -7727,12 -7592,6 +7733,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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/ntb/hw/amd/
 +
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <[email protected]>
  L:    [email protected]
@@@ -7941,12 -7800,11 +7947,12 @@@ F:   drivers/usb/*/*omap
  F:    arch/arm/*omap*/usb*
  
  OMAP GPIO DRIVER
 -M:    Javier Martinez Canillas <[email protected]>
 +M:    Grygorii Strashko <[email protected]>
  M:    Santosh Shilimkar <[email protected]>
  M:    Kevin Hilman <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/gpio/gpio-omap.txt
  F:    drivers/gpio/gpio-omap.c
  
  OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
@@@ -8024,7 -7882,6 +8030,7 @@@ M:      Mark Rutland <[email protected]
  M:    Ian Campbell <[email protected]>
  M:    Kumar Gala <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
  S:    Maintained
  F:    Documentation/devicetree/
  F:    arch/*/boot/dts/
@@@ -8099,7 -7956,7 +8105,7 @@@ L:      [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/orinoco
  W:    http://www.nongnu.org/orinoco/
  S:    Orphan
 -F:    drivers/net/wireless/orinoco/
 +F:    drivers/net/wireless/intersil/orinoco/
  
  OSD LIBRARY and FILESYSTEM
  M:    Boaz Harrosh <[email protected]>
@@@ -8125,7 -7982,7 +8131,7 @@@ M:      Christian Lamparter <chunkeey@google
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/p54
  S:    Maintained
 -F:    drivers/net/wireless/p54/
 +F:    drivers/net/wireless/intersil/p54/
  
  PA SEMI ETHERNET DRIVER
  M:    Olof Johansson <[email protected]>
@@@ -8341,7 -8198,7 +8347,7 @@@ F:      drivers/pci/host/pci-dra7xx.
  PCI DRIVER FOR RENESAS R-CAR
  M:    Simon Horman <[email protected]>
  L:    [email protected]
 -L:    linux-sh@vger.kernel.org
 +L:    linux-renesas-soc@vger.kernel.org
  S:    Maintained
  F:    drivers/pci/host/*rcar*
  
@@@ -8368,12 -8225,6 +8374,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 <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/pci/vmd.c
 +
  PCIE DRIVER FOR ST SPEAR13XX
  M:    Pratyush Anand <[email protected]>
  L:    [email protected]
@@@ -8398,24 -8249,16 +8404,24 @@@ F:   drivers/pci/host/pci-xgene-msi.
  
  PCIE DRIVER FOR HISILICON
  M:    Zhou Wang <[email protected]>
 +M:    Gabriele Paoloni <[email protected]>
  L:    [email protected]
  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 <[email protected]>
 +L:     [email protected]
 +L:     [email protected]
 +S:     Maintained
 +F:     drivers/pci/host/*qcom*
 +
  PCMCIA SUBSYSTEM
  P:    Linux PCMCIA Team
  L:    [email protected]
  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/
@@@ -8532,8 -8375,7 +8538,8 @@@ F:      drivers/pinctrl/intel
  
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <[email protected]>
 -L:    [email protected]
 +M:    Geert Uytterhoeven <[email protected]>
 +L:    [email protected]
  S:    Maintained
  F:    drivers/pinctrl/sh-pfc/
  
@@@ -8544,14 -8386,6 +8550,14 @@@ L:    [email protected] (m
  S:    Maintained
  F:    drivers/pinctrl/samsung/
  
 +PIN CONTROLLER - SINGLE
 +M:    Tony Lindgren <[email protected]>
 +M:    Haojian Zhuang <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/pinctrl/pinctrl-single.c
 +
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -8611,17 -8445,6 +8617,17 @@@ F:    fs/timerfd.
  F:    include/linux/timer*
  F:    kernel/time/*timer*
  
 +POWER MANAGEMENT CORE
 +M:    "Rafael J. Wysocki" <[email protected]>
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
 +S:    Supported
 +F:    drivers/base/power/
 +F:    include/linux/pm.h
 +F:    include/linux/pm_*
 +F:    include/linux/powercap.h
 +F:    drivers/powercap/
 +
  POWER SUPPLY CLASS/SUBSYSTEM and DRIVERS
  M:    Sebastian Reichel <[email protected]>
  M:    Dmitry Eremin-Solenikov <[email protected]>
@@@ -8701,7 -8524,7 +8707,7 @@@ M:      "Luis R. Rodriguez" <[email protected]
  L:    [email protected]
  W:    http://wireless.kernel.org/en/users/Drivers/p54
  S:    Obsolete
 -F:    drivers/net/wireless/prism54/
 +F:    drivers/net/wireless/intersil/prism54/
  
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <[email protected]>
@@@ -8737,7 -8560,7 +8743,7 @@@ M:      Colin Cross <[email protected]
  M:    Kees Cook <[email protected]>
  M:    Tony Luck <[email protected]>
  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
@@@ -8814,19 -8637,12 +8820,19 @@@ S:   Maintaine
  F:    arch/arm/mach-pxa/
  F:    drivers/dma/pxa*
  F:    drivers/pcmcia/pxa2xx*
 +F:    drivers/pinctrl/pxa/
  F:    drivers/spi/spi-pxa2xx*
  F:    drivers/usb/gadget/udc/pxa2*
  F:    include/sound/pxa2xx-lib.h
  F:    sound/arm/pxa*
  F:    sound/soc/pxa/
  
 +PXA GPIO DRIVER
 +M:    Robert Jarzmik <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/gpio/gpio-pxa.c
 +
  PXA3xx NAND FLASH DRIVER
  M:    Ezequiel Garcia <[email protected]>
  L:    [email protected]
@@@ -8927,7 -8743,7 +8933,7 @@@ F:      include/uapi/linux/qnxtypes.
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -8946,14 -8762,13 +8952,14 @@@ QUALCOMM ATHEROS ATH10K WIRELESS DRIVE
  M:    Kalle Valo <[email protected]>
  L:    [email protected]
  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 <[email protected]>
  L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git
  S:    Supported
  F:    arch/hexagon/
  
@@@ -9006,19 -8821,13 +9012,19 @@@ L:   [email protected]
  S:    Maintained
  F:    drivers/video/fbdev/aty/aty128fb.c
  
 +RALINK MIPS ARCHITECTURE
 +M:    John Crispin <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    arch/mips/ralink
 +
  RALINK RT2X00 WIRELESS LAN DRIVER
  P:    rt2x00 project
  M:    Stanislaw Gruszka <[email protected]>
  M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/net/wireless/rt2x00/
 +F:    drivers/net/wireless/ralink/rt2x00/
  
  RAMDISK RAM BLOCK DEVICE DRIVER
  M:    Jens Axboe <[email protected]>
@@@ -9143,22 -8952,8 +9149,22 @@@ F:    drivers/rpmsg
  F:    Documentation/rpmsg.txt
  F:    include/linux/rpmsg.h
  
 +RENESAS ETHERNET DRIVERS
 +R:    Sergei Shtylyov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +F:    drivers/net/ethernet/renesas/
 +F:    include/linux/sh_eth.h
 +
 +RENESAS USB2 PHY DRIVER
 +M:    Yoshihiro Shimoda <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/phy/phy-rcar-gen3-usb2.c
 +
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <[email protected]>
 +T:    git git://git.pengutronix.de/git/pza/linux
  S:    Maintained
  F:    drivers/reset/
  F:    Documentation/devicetree/bindings/reset/
@@@ -9234,7 -9029,7 +9240,7 @@@ F:      net/rose
  RTL2830 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -9244,7 -9039,7 +9250,7 @@@ F:      drivers/media/dvb-frontends/rtl2830
  RTL2832 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -9254,7 -9049,7 +9260,7 @@@ F:      drivers/media/dvb-frontends/rtl2832
  RTL2832_SDR MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -9266,7 -9061,7 +9272,7 @@@ L:      [email protected]
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Orphan
 -F:    drivers/net/wireless/rtl818x/rtl8180/
 +F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
  M:    Herton Ronaldo Krzesinski <[email protected]>
@@@ -9276,7 -9071,7 +9282,7 @@@ L:      [email protected]
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
 -F:    drivers/net/wireless/rtl818x/rtl8187/
 +F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8192CE WIRELESS DRIVER
  M:    Larry Finger <[email protected]>
@@@ -9285,8 -9080,8 +9291,8 @@@ L:      [email protected]
  W:    http://wireless.kernel.org/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
 -F:    drivers/net/wireless/rtlwifi/
 -F:    drivers/net/wireless/rtlwifi/rtl8192ce/
 +F:    drivers/net/wireless/realtek/rtlwifi/
 +F:    drivers/net/wireless/realtek/rtlwifi/rtl8192ce/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
@@@ -9306,7 -9101,6 +9312,7 @@@ M:      Martin Schwidefsky <[email protected]
  M:    Heiko Carstens <[email protected]>
  L:    [email protected]
  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/
@@@ -9331,7 -9125,7 +9337,7 @@@ F:      drivers/s390/block/dasd
  F:    block/partitions/ibm.c
  
  S390 NETWORK DRIVERS
 -M:    Ursula Braun <ursula.braun@de.ibm.com>
 +M:    Ursula Braun <u[email protected].ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -9361,7 -9155,7 +9367,7 @@@ S:      Supporte
  F:    drivers/s390/scsi/zfcp_*
  
  S390 IUCV NETWORK LAYER
 -M:    Ursula Braun <ursula.braun@de.ibm.com>
 +M:    Ursula Braun <u[email protected].ibm.com>
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -9386,14 -9180,14 +9392,14 @@@ SAA6588 RDS RECEIVER DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/i2c/saa6588*
  
  SAA7134 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/*.saa7134
@@@ -9438,10 -9232,8 +9444,10 @@@ F:    drivers/regulator/s5m*.
  F:    drivers/clk/clk-s2mps11.c
  F:    drivers/rtc/rtc-s5m.c
  F:    include/linux/mfd/samsung/
 -F:    Documentation/devicetree/bindings/regulator/s5m8767-regulator.txt
 -F:    Documentation/devicetree/bindings/mfd/s2mp*.txt
 +F:    Documentation/devicetree/bindings/mfd/samsung,sec-core.txt
 +F:    Documentation/devicetree/bindings/regulator/samsung,s2m*.txt
 +F:    Documentation/devicetree/bindings/regulator/samsung,s5m*.txt
 +F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.txt
  
  SAMSUNG S5P/EXYNOS4 SOC SERIES CAMERA SUBSYSTEM DRIVERS
  M:    Kyungmin Park <[email protected]>
@@@ -9457,7 -9249,7 +9463,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/media/platform/s3c-camif/
 -F:    include/media/s3c_camif.h
 +F:    include/media/drv-intf/s3c_camif.h
  
  SAMSUNG S5C73M3 CAMERA DRIVER
  M:    Kyungmin Park <[email protected]>
@@@ -9499,7 -9291,7 +9505,7 @@@ M:      Lukasz Majewski <l.majewski@samsung.
  L:    [email protected]
  L:    [email protected]
  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
@@@ -9565,7 -9357,7 +9571,7 @@@ M:      Andreas Noever <andreas.noever@gmail
  S:    Maintained
  F:    drivers/thunderbolt/
  
 -TIMEKEEPING, CLOCKSOURCE CORE, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <[email protected]>
  M:    Thomas Gleixner <[email protected]>
  L:    [email protected]
@@@ -9578,7 -9370,6 +9584,7 @@@ F:      include/uapi/linux/time.
  F:    include/uapi/linux/timex.h
  F:    kernel/time/clocksource.c
  F:    kernel/time/time*.c
 +F:    kernel/time/alarmtimer.c
  F:    kernel/time/ntp.c
  F:    tools/testing/selftests/timers/
  
@@@ -9833,7 -9624,7 +9839,7 @@@ F:      drivers/misc/sgi-xp
  SI2157 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -9843,7 -9634,7 +9849,7 @@@ F:      drivers/media/tuners/si2157
  SI2168 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -9854,7 -9645,7 +9860,7 @@@ SI470X FM RADIO RECEIVER I2C DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/radio/si470x/radio-si470x-i2c.c
  
@@@ -9862,7 -9653,7 +9868,7 @@@ SI470X FM RADIO RECEIVER USB DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/si470x/radio-si470x-common.c
  F:    drivers/media/radio/si470x/radio-si470x.h
@@@ -9872,7 -9663,7 +9878,7 @@@ SI4713 FM RADIO TRANSMITTER I2C DRIVE
  M:    Eduardo Valentin <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/radio/si4713/si4713.?
  
@@@ -9880,7 -9671,7 +9886,7 @@@ SI4713 FM RADIO TRANSMITTER PLATFORM DR
  M:    Eduardo Valentin <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/radio/si4713/radio-platform-si4713.c
  
@@@ -9888,14 -9679,14 +9894,14 @@@ SI4713 FM RADIO TRANSMITTER USB DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/si4713/radio-usb-si4713.c
  
  SIANO DVB DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/common/siano/
@@@ -9920,7 -9711,7 +9926,7 @@@ SH_VOU V4L2 OUTPUT DRIVE
  L:    [email protected]
  S:    Orphan
  F:    drivers/media/platform/sh_vou.c
 -F:    include/media/sh_vou.h
 +F:    include/media/drv-intf/sh_vou.h
  
  SIMPLE FIRMWARE INTERFACE (SFI)
  M:    Len Brown <[email protected]>
@@@ -9961,7 -9752,7 +9967,7 @@@ F:      drivers/i2c/busses/i2c-davinci.
  TI DAVINCI SERIES MEDIA DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  S:    Maintained
@@@ -9971,7 -9762,7 +9977,7 @@@ F:      include/media/davinci
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  S:    Maintained
@@@ -9980,12 -9771,12 +9986,12 @@@ F:   drivers/media/platform/am437x
  OV2659 OMNIVISION SENSOR DRIVER
  M:    "Lad, Prabhakar" <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
  S:    Maintained
  F:    drivers/media/i2c/ov2659.c
 -F:    include/media/ov2659.h
 +F:    include/media/i2c/ov2659.h
  
  SILICON MOTION SM712 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <[email protected]>
@@@ -10074,7 -9865,7 +10080,7 @@@ M:    Sakari Ailus <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/smiapp/
 -F:    include/media/smiapp.h
 +F:    include/media/i2c/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
  F:    include/uapi/linux/smiapp.h
@@@ -10151,8 -9942,8 +10157,8 @@@ S:    Supporte
  F:    drivers/media/pci/solo6x10/
  
  SOFTWARE RAID (Multiple Disks) SUPPORT
 -M:    Neil Brown <[email protected]>
  L:    [email protected]
 +T:    git git://neil.brown.name/md
  S:    Supported
  F:    drivers/md/
  F:    include/linux/raid/
@@@ -10238,7 -10029,7 +10244,7 @@@ F:   sound/soc/soc-generic-dmaengine-pcm.
  SP2 MEDIA DRIVER
  M:    Olli Salonen <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  S:    Maintained
  F:    drivers/media/dvb-frontends/sp2*
@@@ -10324,7 -10115,6 +10330,7 @@@ SQUASHFS FILE SYSTE
  M:    Phillip Lougher <[email protected]>
  L:    [email protected] (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/
@@@ -10385,8 -10175,16 +10391,8 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/staging/nvec/
  
 -STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 -M:    Jens Frederich <[email protected]>
 -M:    Daniel Drake <[email protected]>
 -M:    Jon Nettleton <[email protected]>
 -W:    http://wiki.laptop.org/go/DCON
 -S:    Maintained
 -F:    drivers/staging/olpc_dcon/
 -
  STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
 -M:    Willy Tarreau <willy@meta-x.org>
 +M:    Willy Tarreau <willy@haproxy.com>
  S:    Odd Fixes
  F:    drivers/staging/panel/
  
@@@ -10482,11 -10280,9 +10488,11 @@@ S: Maintaine
  F:    drivers/net/ethernet/dlink/sundance.c
  
  SUPERH
 +M:    Yoshinori Sato <[email protected]>
 +M:    Rich Felker <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/sh/
  F:    arch/sh/
  F:    drivers/sh/
@@@ -10515,7 -10311,6 +10521,7 @@@ F:   arch/x86/boot/video
  SWIOTLB SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <[email protected]>
  L:    [email protected]
 +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
@@@ -10596,7 -10391,7 +10602,7 @@@ F:   net/ipv4/tcp_lp.
  TDA10071 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -10606,7 -10401,7 +10612,7 @@@ F:   drivers/media/dvb-frontends/tda10071
  TDA18212 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -10616,7 -10411,7 +10622,7 @@@ F:   drivers/media/tuners/tda18212
  TDA18218 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -10626,7 -10421,7 +10632,7 @@@ F:   drivers/media/tuners/tda18218
  TDA18271 MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10636,7 -10431,7 +10642,7 @@@ F:   drivers/media/tuners/tda18271
  TDA827x MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10646,7 -10441,7 +10652,7 @@@ F:   drivers/media/tuners/tda8290.
  TDA8290 MEDIA DRIVER
  M:    Michael Krufky <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://github.com/mkrufky
  Q:    http://patchwork.linuxtv.org/project/linux-media/list/
  T:    git git://linuxtv.org/mkrufky/tuners.git
@@@ -10657,14 -10452,14 +10663,14 @@@ TDA9840 MEDIA DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tda9840*
  
  TEA5761 TUNER DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/tuners/tea5761.*
@@@ -10672,7 -10467,7 +10678,7 @@@
  TEA5767 TUNER DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/tuners/tea5767.*
@@@ -10681,7 -10476,7 +10687,7 @@@ TEA6415C MEDIA DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tea6415c*
  
@@@ -10689,7 -10484,7 +10695,7 @@@ TEA6420 MEDIA DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tea6420*
  
@@@ -10779,7 -10574,6 +10785,7 @@@ TENSILICA XTENSA PORT (xtensa
  M:    Chris Zankel <[email protected]>
  M:    Max Filippov <[email protected]>
  L:    [email protected]
 +T:    git git://github.com/czankel/xtensa-linux.git
  S:    Maintained
  F:    arch/xtensa/
  F:    drivers/irqchip/irq-xtensa-*
@@@ -10788,7 -10582,7 +10794,7 @@@ THANKO'S RAREMONO AM/FM/SW RADIO RECEIV
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-raremono.c
  
@@@ -10938,7 -10732,6 +10944,7 @@@ F:   net/tipc
  TILE ARCHITECTURE
  M:    Chris Metcalf <[email protected]>
  W:    http://www.ezchip.com/scm/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git
  S:    Supported
  F:    arch/tile/
  F:    drivers/char/tile-srom.c
@@@ -11013,7 -10806,7 +11019,7 @@@ M:   Mats Randgaard <[email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/media/i2c/tc358743*
 -F:    include/media/tc358743.h
 +F:    include/media/i2c/tc358743.h
  
  TMIO MMC DRIVER
  M:    Ian Molton <[email protected]>
@@@ -11041,7 -10834,7 +11047,7 @@@ F:   mm/shmem.
  TM6000 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/usb/tm6000/
@@@ -11050,7 -10843,7 +11056,7 @@@ TW68 VIDEO4LINUX DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/pci/tw68/
  
@@@ -11062,7 -10855,7 +11068,7 @@@ R:   Jason Gunthorpe <jgunthorpe@obsidian
  W:    http://tpmdd.sourceforge.net
  L:    [email protected] (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/
  
@@@ -11111,7 -10904,7 +11117,7 @@@ F:   include/uapi/linux/tty.
  TUA9001 MEDIA DRIVER
  M:    Antti Palosaari <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.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
@@@ -11313,7 -11106,6 +11319,7 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <[email protected]>
 +R:    Benjamin Tissoires <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -11355,7 -11147,7 +11361,7 @@@ F:   Documentation/usb/ohci.tx
  F:    drivers/usb/host/ohci*
  
  USB OTG FSM (Finite State Machine)
 -M:    Peter Chen <Peter.Chen@freescale.com>
 +M:    Peter Chen <Peter.Chen@nxp.com>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git
  L:    [email protected]
  S:    Maintained
@@@ -11391,13 -11183,6 +11397,13 @@@ L: [email protected]
  S:    Supported
  F:    drivers/usb/class/usblp.c
  
 +USB QMI WWAN NETWORK DRIVER
 +M:    Bjørn Mork <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-net-qmi
 +F:    drivers/net/usb/qmi_wwan.c
 +
  USB RTL8150 DRIVER
  M:    Petko Manolov <[email protected]>
  L:    [email protected]
@@@ -11466,7 -11251,7 +11472,7 @@@ USB VISION DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/usb/usbvision/
  
@@@ -11494,7 -11279,7 +11500,7 @@@ USB ZD1201 DRIVE
  L:    [email protected]
  W:    http://linux-lc100020.sourceforge.net
  S:    Orphan
 -F:    drivers/net/wireless/zd1201.*
 +F:    drivers/net/wireless/zydas/zd1201.*
  
  USB ZR364XX DRIVER
  M:    Antoine Jacquet <[email protected]>
@@@ -11519,7 -11304,6 +11525,7 @@@ M:   Richard Weinberger <[email protected]
  L:    [email protected]
  L:    [email protected]
  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/
@@@ -11566,7 -11350,6 +11572,7 @@@ F:   fs/fat
  VFIO DRIVER
  M:    Alex Williamson <[email protected]>
  L:    [email protected]
 +T:    git git://github.com/awilliam/linux-vfio.git
  S:    Maintained
  F:    Documentation/vfio.txt
  F:    drivers/vfio/
@@@ -11636,7 -11419,6 +11642,7 @@@ M:   "Michael S. Tsirkin" <[email protected]
  L:    [email protected]
  L:    [email protected]
  L:    [email protected]
 +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
@@@ -11683,7 -11465,7 +11689,7 @@@ VIVID VIRTUAL VIDEO DRIVE
  M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/platform/vivid/*
  
@@@ -11829,7 -11611,6 +11835,7 @@@ F:   drivers/input/tablet/wacom_serial4.
  
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <[email protected]>
 +R:    Guenter Roeck <[email protected]>
  L:    [email protected]
  W:    http://www.linux-watchdog.org/
  T:    git git://www.linux-watchdog.org/linux-watchdog.git
@@@ -11901,7 -11682,6 +11907,7 @@@ F:   drivers/input/touchscreen/wm831x-ts.
  F:    drivers/input/touchscreen/wm97*.c
  F:    drivers/mfd/arizona*
  F:    drivers/mfd/wm*.c
 +F:    drivers/mfd/cs47l24*
  F:    drivers/power/wm83*.c
  F:    drivers/rtc/rtc-wm83*.c
  F:    drivers/regulator/wm8*.c
@@@ -11915,7 -11695,6 +11921,7 @@@ F:   include/linux/wm97xx.
  F:    include/sound/wm????.h
  F:    sound/soc/codecs/arizona.?
  F:    sound/soc/codecs/wm*
 +F:    sound/soc/codecs/cs47l24*
  
  WORKQUEUE
  M:    Tejun Heo <[email protected]>
@@@ -11975,7 -11754,7 +11981,7 @@@ F:   arch/x86/entry/vdso
  XC2028/3028 TUNER DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
@@@ -12053,7 -11832,7 +12059,7 @@@ M:   Dave Chinner <[email protected]
  M:    [email protected]
  L:    [email protected]
  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/
@@@ -12131,7 -11910,7 +12137,7 @@@ W:   http://zd1211.ath.cx/wiki/DriverRewr
  L:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
 -F:    drivers/net/wireless/zd1211rw/
 +F:    drivers/net/wireless/zydas/zd1211rw/
  
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <[email protected]>
@@@ -12144,7 -11923,7 +12150,7 @@@ ZR36067 VIDEO FOR LINUX DRIVE
  L:    [email protected]
  L:    [email protected]
  W:    http://mjpeg.sourceforge.net/driver-zoran/
 -T:    hg http://linuxtv.org/hg/v4l-dvb
 +T:    hg https://linuxtv.org/hg/v4l-dvb
  S:    Odd Fixes
  F:    drivers/media/pci/zoran/
  

diff --combined drivers/iio/industrialio-core.c
index af7cc1e65656e1bf0ac83f561945bbbcf45d9de9,eb01a83a5b7c1c76804eb8d0b9b2fe1330281eb2..70cb7eb0a75cacc43c8dcdce72fc0ecf74af5398
--- 1/drivers/iio/industrialio-core.c
--- 2/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@@ -77,6 -77,7 +77,7 @@@ static const char * const iio_chan_type
        [IIO_VELOCITY] = "velocity",
        [IIO_CONCENTRATION] = "concentration",
        [IIO_RESISTANCE] = "resistance",
+       [IIO_PH] = "ph",
  };
  
  static const char * const iio_modifier_names[] = {
@@@ -433,15 -434,16 +434,15 @@@ ssize_t iio_format_value(char *buf, uns
                scale_db = true;
        case IIO_VAL_INT_PLUS_MICRO:
                if (vals[1] < 0)
 -                      return sprintf(buf, "-%ld.%06u%s\n", abs(vals[0]),
 -                                      -vals[1],
 -                              scale_db ? " dB" : "");
 +                      return sprintf(buf, "-%d.%06u%s\n", abs(vals[0]),
 +                                     -vals[1], scale_db ? " dB" : "");
                else
                        return sprintf(buf, "%d.%06u%s\n", vals[0], vals[1],
                                scale_db ? " dB" : "");
        case IIO_VAL_INT_PLUS_NANO:
                if (vals[1] < 0)
 -                      return sprintf(buf, "-%ld.%09u\n", abs(vals[0]),
 -                                      -vals[1]);
 +                      return sprintf(buf, "-%d.%09u\n", abs(vals[0]),
 +                                     -vals[1]);
                else
                        return sprintf(buf, "%d.%09u\n", vals[0], vals[1]);
        case IIO_VAL_FRACTIONAL: