Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

Pull HID updates from Jiri Kosina:

 - appoint Benjamin Tissoires as co-maintainer / designated reviewer

 - sysfs report_descriptor visibility fix for unclaimed devices, from
   Andy Lutomirski

 - suspend/resume fixes for Sony driver from Frank Praznik

 - IRQ deadlock fix from Ioan-Adrian Ratiu

 - hid-i2c fixes affecting (at least) Yoga 900 from Mika Westerberg and
   Srinivas Pandruvada

 - a lot of new device support (especially, but not limited to, Wacom)
   and assorted small misc fixes

 - almost complete G920 support; the only bit that is missing is
   switching the device to HID mode automatically; Simon Wood and Michal
   Maly are working on it.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (46 commits)
  Revert "INPUT: xpad: switch Logitech G920 Wheel into HID mode"
  HID: sensor-hub: Add quirk for Lenovo Yoga 900 with ITE Chips
  HID: Add new PID for Microchip Pick16F1454
  HID: wacom: Use correct report to query pen ID from INTUOSHT2 devices
  HID: i2c-hid: Prevent sending reports from racing with device reset
  HID: use kobj_to_dev()
  HID: wiimote: use dev_to_wii()
  HID: add a new helper to_hid_driver()
  HID: use to_hid_device()
  HID: move to_hid_device() to hid.h
  HID: usbhid: use to_usb_device
  HID: corsair: Convert to use module_hid_driver
  HID: input: ignore the battery in OKLICK Laser BTmouse
  HID: wacom: Fix pad button range for CINTIQ_COMPANION_2
  HID: wacom: Fix touchring value reporting
  HID: wacom: Report 'strip2' values in ABS_RY
  HID: wacom: Limit touchstrip data to 13 bits
  HID: wacom: bitwise vs logical ORs
  HID: wacom: Apply lowres quirk to BAMBOO_TOUCH devices
  HID: enable hid device to suspend/resume asynchronously
  ...

diff --combined MAINTAINERS
index ab68d0597542f47499e2b796434aa8a072161cef,b81565bae9fca418d95b46f7c5449a79c9457a5a..5696e08918f2df762fc0517100574a4d6511076f
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -206,7 -206,7 +206,7 @@@ F: include/trace/events/9p.
  A8293 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -318,7 -318,7 +318,7 @@@ M: Zhang Rui <rui.zhang@intel.com
  L:    linux-acpi@vger.kernel.org
  W:    https://01.org/linux-acpi
  S:    Supported
 -F:    drivers/acpi/video.c
 +F:    drivers/acpi/acpi_video.c
  
  ACPI WMI DRIVER
  L:    platform-driver-x86@vger.kernel.org
@@@ -371,15 -371,6 +371,15 @@@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASL
  M:    Jiri Kosina <jikos@kernel.org>
  S:    Maintained
  
 +ADF7242 IEEE 802.15.4 RADIO DRIVER
 +M:    Michael Hennerich <michael.hennerich@analog.com>
 +W:    https://wiki.analog.com/ADF7242
 +W:    http://ez.analog.com/community/linux-device-drivers
 +L:    linux-wpan@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ieee802154/adf7242.c
 +F:    Documentation/devicetree/bindings/net/ieee802154/adf7242.txt
 +
  ADM1025 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <jdelvare@suse.com>
  L:    lm-sensors@lm-sensors.org
@@@ -397,14 -388,14 +397,14 @@@ ADM8211 WIRELESS DRIVE
  L:    linux-wireless@vger.kernel.org
  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 <sakari.ailus@iki.fi>
  L:    linux-media@vger.kernel.org
  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 <michael.hennerich@analog.com>
@@@ -475,7 -466,7 +475,7 @@@ F: sound/oss/aedsp16.
  AF9013 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -485,7 -476,7 +485,7 @@@ F: drivers/media/dvb-frontends/af9013
  AF9033 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -531,7 -522,7 +531,7 @@@ AIMSLAB FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-aimslab*
  
@@@ -545,7 -536,7 +545,7 @@@ F: include/linux/*aio*.
  AIRSPY MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -623,9 -614,9 +623,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:    lm-sensors@lm-sensors.org
 -S:    Maintained
 +S:    Supported
  F:    Documentation/hwmon/fam15h_power
  F:    drivers/hwmon/fam15h_power.c
  
@@@ -1782,7 -1773,7 +1782,7 @@@ L:      linux-media@vger.kernel.or
  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 <george.joseph@fairview5.com>
@@@ -1856,7 -1847,7 +1856,7 @@@ S:      Supporte
  F:    drivers/net/wireless/ath/ath6kl/
  
  WILOCITY WIL6210 WIRELESS DRIVER
 -M:    Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
 +M:    Maya Erez <qca_merez@qca.qualcomm.com>
  L:    linux-wireless@vger.kernel.org
  L:    wil6210@qca.qualcomm.com
  S:    Supported
@@@ -1905,6 -1896,7 +1905,6 @@@ ATMEL AT91 / AT32 MCI DRIVE
  M:    Ludovic Desroches <ludovic.desroches@atmel.com>
  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 <nicolas.ferre@atmel.com>
@@@ -2001,7 -1993,7 +2001,7 @@@ L:      linux-wireless@vger.kernel.or
  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 <nick.dyer@itdev.co.uk>
@@@ -2072,7 -2064,7 +2072,7 @@@ F:      net/ax25
  AZ6007 DVB DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -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
@@@ -2081,7 -2073,7 +2081,7 @@@ AZTECH FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-aztech*
  
@@@ -2090,7 -2082,7 +2090,7 @@@ L:      linux-wireless@vger.kernel.or
  L:    b43-dev@lists.infradead.org
  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 <Larry.Finger@lwfinger.net>
@@@ -2098,7 -2090,7 +2098,7 @@@ L:      linux-wireless@vger.kernel.or
  L:    b43-dev@lists.infradead.org
  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 <jingoohan1@gmail.com>
@@@ -2110,7 -2102,7 +2110,7 @@@ F:      include/linux/backlight.
  BATMAN ADVANCED
  M:    Marek Lindner <mareklindner@neomailbox.ch>
  M:    Simon Wunderlich <sw@simonwunderlich.de>
 -M:    Antonio Quartulli <antonio@meshcoding.com>
 +M:    Antonio Quartulli <a@unstable.cc>
  L:    b.a.t.m.a.n@lists.open-mesh.org
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -2134,7 -2126,7 +2134,7 @@@ BDISP ST MEDIA DRIVE
  M:    Fabien Dessenne <fabien.dessenne@st.com>
  L:    linux-media@vger.kernel.org
  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 -2392,7 +2400,7 @@@ M:      Hante Meuleman <meuleman@broadcom.co
  L:    linux-wireless@vger.kernel.org
  L:    brcm80211-dev-list@broadcom.com
  S:    Supported
 -F:    drivers/net/wireless/brcm80211/
 +F:    drivers/net/wireless/broadcom/brcm80211/
  
  BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
  M:    QLogic-Storage-Upstream@qlogic.com
@@@ -2527,7 -2519,7 +2527,7 @@@ F:      fs/btrfs
  BTTV VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/bttv/
@@@ -2566,7 -2558,7 +2566,7 @@@ CADET FM/AM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-cadet*
  
@@@ -2767,7 -2759,7 +2767,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:    linux-usb@vger.kernel.org
  S:    Maintained
@@@ -2859,7 -2851,7 +2859,7 @@@ COBALT MEDIA DRIVE
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Supported
  F:    drivers/media/pci/cobalt/
  
@@@ -2947,8 -2939,7 +2947,8 @@@ F:      drivers/usb/atm/cxacru.
  
  CONFIGFS
  M:    Joel Becker <jlbec@evilplan.org>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git
 +M:    Christoph Hellwig <hch@lst.de>
 +T:    git git://git.infradead.org/users/hch/configfs.git
  S:    Supported
  F:    fs/configfs/
  F:    include/linux/configfs.h
@@@ -2984,7 -2975,6 +2984,7 @@@ F:      kernel/cpuset.
  CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG)
  M:    Johannes Weiner <hannes@cmpxchg.org>
  M:    Michal Hocko <mhocko@kernel.org>
 +M:    Vladimir Davydov <vdavydov@virtuozzo.com>
  L:    cgroups@vger.kernel.org
  L:    linux-mm@kvack.org
  S:    Maintained
@@@ -3105,15 -3095,6 +3105,15 @@@ S:    Maintaine
  F:    crypto/ansi_cprng.c
  F:    crypto/rng.c
  
 +CS3308 MEDIA DRIVER
 +M:    Hans Verkuil <hverkuil@xs4all.nl>
 +L:    linux-media@vger.kernel.org
 +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 <jayakumar.alsa@gmail.com>
  S:    Maintained
@@@ -3122,14 -3103,14 +3122,14 @@@ F:   sound/pci/cs5535audio
  CW1200 WLAN driver
  M:    Solomon Peachy <pizza@shaftnet.org>
  S:    Maintained
 -F:    drivers/net/wireless/cw1200/
 +F:    drivers/net/wireless/st/cw1200/
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@md.metrocast.net>
  L:    ivtv-devel@ivtvdriver.org (subscribers-only)
  L:    linux-media@vger.kernel.org
  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
@@@ -3140,7 -3121,7 +3140,7 @@@ CX2341X MPEG ENCODER HELPER MODUL
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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*
@@@ -3149,7 -3130,7 +3149,7 @@@ CX24120 MEDIA DRIVE
  M:    Jemma Denson <jdenson@gmail.com>
  M:    Patrick Boettcher <patrick.boettcher@posteo.de>
  L:    linux-media@vger.kernel.org
 -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*
@@@ -3157,7 -3138,7 +3157,7 @@@
  CX88 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/cx88/
@@@ -3166,7 -3147,7 +3166,7 @@@ F:      drivers/media/pci/cx88
  CXD2820R MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3272,7 -3253,7 +3272,7 @@@ F:      drivers/net/wan/pc300
  CYPRESS_FIRMWARE MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3779,14 -3760,14 +3779,14 @@@ DT3155 MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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 <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3796,7 -3777,7 +3796,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9015
  DVB_USB_AF9035 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3806,7 -3787,7 +3806,7 @@@ F:      drivers/media/usb/dvb-usb-v2/af9035
  DVB_USB_ANYSEE MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3816,7 -3797,7 +3816,7 @@@ F:      drivers/media/usb/dvb-usb-v2/anysee
  DVB_USB_AU6610 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3826,7 -3807,7 +3826,7 @@@ F:      drivers/media/usb/dvb-usb-v2/au6610
  DVB_USB_CE6230 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3836,7 -3817,7 +3836,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ce6230
  DVB_USB_CXUSB MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3846,7 -3827,7 +3846,7 @@@ F:      drivers/media/usb/dvb-usb/cxusb
  DVB_USB_EC168 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3856,7 -3837,7 +3856,7 @@@ F:      drivers/media/usb/dvb-usb-v2/ec168
  DVB_USB_GL861 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3865,7 -3846,7 +3865,7 @@@ F:      drivers/media/usb/dvb-usb-v2/gl861
  DVB_USB_MXL111SF MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3875,7 -3856,7 +3875,7 @@@ F:      drivers/media/usb/dvb-usb-v2/mxl111s
  DVB_USB_RTL28XXU MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3885,7 -3866,7 +3885,7 @@@ F:      drivers/media/usb/dvb-usb-v2/rtl28xx
  DVB_USB_V2 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3915,7 -3896,7 +3915,7 @@@ F:      Documentation/devicetree/bindings/in
  E4000 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3931,7 -3912,7 +3931,7 @@@ F:      drivers/scsi/eata.
  EC100 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -3952,8 -3933,9 +3952,8 @@@ M:      Doug Thompson <dougthompson@xmission
  M:    Borislav Petkov <bp@alien8.de>
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
 -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/
@@@ -3963,6 -3945,7 +3963,6 @@@ EDAC-AMD6
  M:    Doug Thompson <dougthompson@xmission.com>
  M:    Borislav Petkov <bp@alien8.de>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/amd64_edac*
  
@@@ -3970,6 -3953,7 +3970,6 @@@ EDAC-CALXED
  M:    Doug Thompson <dougthompson@xmission.com>
  M:    Robert Richter <rric@kernel.org>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/highbank*
  
@@@ -3978,6 -3962,7 +3978,6 @@@ M:      Ralf Baechle <ralf@linux-mips.org
  M:    David Daney <david.daney@cavium.com>
  L:    linux-edac@vger.kernel.org
  L:    linux-mips@linux-mips.org
 -W:    bluesmoke.sourceforge.net
  S:    Supported
  F:    drivers/edac/octeon_edac*
  
@@@ -3985,54 -3970,63 +3985,54 @@@ EDAC-E752
  M:    Mark Gross <mark.gross@intel.com>
  M:    Doug Thompson <dougthompson@xmission.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e752x_edac.c
  
  EDAC-E7XXX
  M:    Doug Thompson <dougthompson@xmission.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/e7xxx_edac.c
  
  EDAC-GHES
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/ghes_edac.c
  
  EDAC-I82443BXGX
  M:    Tim Small <tim@buttersideup.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82443bxgx_edac.c
  
  EDAC-I3000
  M:    Jason Uhlenkott <juhlenko@akamai.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i3000_edac.c
  
  EDAC-I5000
  M:    Doug Thompson <dougthompson@xmission.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5000_edac.c
  
  EDAC-I5400
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i5400_edac.c
  
  EDAC-I7300
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7300_edac.c
  
  EDAC-I7CORE
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i7core_edac.c
  
@@@ -4040,36 -4034,42 +4040,36 @@@ EDAC-I82975
  M:    Ranganathan Desikan <ravi@jetztechnologies.com>
  M:    "Arvind R." <arvino55@gmail.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/i82975x_edac.c
  
  EDAC-IE31200
  M:    Jason Baron <jbaron@akamai.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/ie31200_edac.c
  
  EDAC-MPC85XX
  M:    Johannes Thumshirn <morbidrsa@gmail.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/mpc85xx_edac.[ch]
  
  EDAC-PASEMI
  M:    Egor Martovetsky <egor@pasemi.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/pasemi_edac.c
  
  EDAC-R82600
  M:    Tim Small <tim@buttersideup.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/r82600_edac.c
  
  EDAC-SBRIDGE
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
 -W:    bluesmoke.sourceforge.net
  S:    Maintained
  F:    drivers/edac/sb_edac.c
  
@@@ -4136,7 -4136,7 +4136,7 @@@ F:      drivers/net/ethernet/ibm/ehea
  EM28XX VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/usb/em28xx/
@@@ -4276,7 -4276,7 +4276,7 @@@ F:      drivers/media/tuners/fc0011.
  FC2580 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -4599,7 -4599,7 +4599,7 @@@ M:      Heungjun Kim <riverful.kim@samsung.c
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/m5mols/
 -F:    include/media/m5mols.h
 +F:    include/media/i2c/m5mols.h
  
  FUJITSU TABLET EXTRAS
  M:    Robert Gerlach <khnz@gmx.de>
@@@ -4645,7 -4645,7 +4645,7 @@@ GEMTEK FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-gemtek*
  
@@@ -4853,7 -4853,7 +4853,7 @@@ HDPVR USB VIDEO ENCODER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/usb/hdpvr/
  
@@@ -4872,7 -4872,7 +4872,7 @@@ F:      drivers/tty/hvc
  HACKRF MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -4915,7 -4915,7 +4915,7 @@@ F:      sound/parisc/harmony.
  HD29L2 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -4984,6 -4984,7 +4984,7 @@@ F:      arch/*/include/asm/suspend*.
  
  HID CORE LAYER
  M:    Jiri Kosina <jikos@kernel.org>
+ R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-input@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -5038,20 -5039,13 +5039,20 @@@ F:   include/uapi/linux/if_hippi.
  F:    net/802/hippi.c
  F:    drivers/net/hippi/
  
 +HISILICON SAS Controller
 +M:    John Garry <john.garry@huawei.com>
 +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 <j@w1.fi>
  L:    hostap@shmoo.com (subscribers-only)
  L:    linux-wireless@vger.kernel.org
  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:    platform-driver-x86@vger.kernel.org
@@@ -5289,13 -5283,6 +5290,13 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
 +IBM Power SRIOV Virtual NIC Device Driver
 +M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 +M:    John Allen <jallen@linux.vnet.ibm.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/ibm/ibmvnic.*
 +
  IBM Power Virtual SCSI Device Drivers
  M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
@@@ -5591,7 -5578,7 +5592,7 @@@ R:      Jesse Brandeburg <jesse.brandeburg@i
  R:    Shannon Nelson <shannon.nelson@intel.com>
  R:    Carolyn Wyborny <carolyn.wyborny@intel.com>
  R:    Don Skidmore <donald.c.skidmore@intel.com>
 -R:    Matthew Vick <matthew.vick@intel.com>
 +R:    Bruce Allan <bruce.w.allan@intel.com>
  R:    John Ronciak <john.ronciak@intel.com>
  R:    Mitch Williams <mitch.a.williams@intel.com>
  L:    intel-wired-lan@lists.osuosl.org
@@@ -5626,7 -5613,7 +5627,7 @@@ L:      linux-wireless@vger.kernel.or
  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 <alexander.shishkin@linux.intel.com>
@@@ -5635,7 -5622,9 +5636,7 @@@ F:      Documentation/trace/intel_th.tx
  F:    drivers/hwtracing/intel_th/
  
  INTEL(R) TRUSTED EXECUTION TECHNOLOGY (TXT)
 -M:    Richard L Maliszewski <richard.l.maliszewski@intel.com>
 -M:    Gang Wei <gang.wei@intel.com>
 -M:    Shane Wang <shane.wang@intel.com>
 +M:    Ning Sun <ning.sun@intel.com>
  L:    tboot-devel@lists.sourceforge.net
  W:    http://tboot.sourceforge.net
  T:    hg http://tboot.hg.sourceforge.net:8000/hgroot/tboot/tboot
@@@ -5658,7 -5647,7 +5659,7 @@@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwl
  M:    Stanislaw Gruszka <sgruszka@redhat.com>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
 -F:    drivers/net/wireless/iwlegacy/
 +F:    drivers/net/wireless/intel/iwlegacy/
  
  INTEL WIRELESS WIFI LINK (iwlwifi)
  M:    Johannes Berg <johannes.berg@intel.com>
@@@ -5668,7 -5657,7 +5669,7 @@@ L:      linux-wireless@vger.kernel.or
  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 <tomas.winkler@intel.com>
@@@ -5833,7 -5822,7 +5834,7 @@@ ISA RADIO MODUL
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-isa*
  
@@@ -5903,7 -5892,7 +5904,7 @@@ F:      drivers/hwmon/it87.
  IT913X MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -5924,7 -5913,7 +5925,7 @@@ F:      include/uapi/linux/ivtv
  IX2505V MEDIA DRIVER
  M:    Malcolm Priestley <tvboxspy@gmail.com>
  L:    linux-media@vger.kernel.org
 -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*
@@@ -6013,7 -6002,7 +6014,7 @@@ KEENE FM RADIO TRANSMITTER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-keene*
  
@@@ -6113,7 -6102,6 +6114,7 @@@ M:      Marc Zyngier <marc.zyngier@arm.com
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kvmarm@lists.cs.columbia.edu
  W:    http://systems.cs.columbia.edu/projects/kvm-arm
 +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*
@@@ -6266,7 -6254,7 +6267,7 @@@ F:      drivers/usb/misc/legousbtower.
  LG2160 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -6276,7 -6264,7 +6277,7 @@@ F:      drivers/media/dvb-frontends/lg2160.
  LGDT3305 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -6533,7 -6521,7 +6534,7 @@@ F:      drivers/hwmon/lm95234.
  LME2510 MEDIA DRIVER
  M:    Malcolm Priestley <tvboxspy@gmail.com>
  L:    linux-media@vger.kernel.org
 -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*
@@@ -6639,7 -6627,7 +6640,7 @@@ F:      arch/m68k/hp300
  M88DS3103 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -6649,7 -6637,7 +6650,7 @@@ F:      drivers/media/dvb-frontends/m88ds310
  M88RS2000 MEDIA DRIVER
  M:    Malcolm Priestley <tvboxspy@gmail.com>
  L:    linux-media@vger.kernel.org
 -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*
@@@ -6720,7 -6708,7 +6721,7 @@@ F:      drivers/net/ethernet/marvell/sk
  MARVELL LIBERTAS WIRELESS DRIVER
  L:    libertas-dev@lists.infradead.org
  S:    Orphan
 -F:    drivers/net/wireless/libertas/
 +F:    drivers/net/wireless/marvell/libertas/
  
  MARVELL MV643XX ETHERNET DRIVER
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -6740,13 -6728,13 +6741,13 @@@ M:   Amitkumar Karwar <akarwar@marvell.co
  M:    Nishant Sarmukadam <nishants@marvell.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/wireless/mwifiex/
 +F:    drivers/net/wireless/marvell/mwifiex/
  
  MARVELL MWL8K WIRELESS DRIVER
  M:    Lennert Buytenhek <buytenh@wantstofly.org>
  L:    linux-wireless@vger.kernel.org
  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 <nico@fluxnic.net>
@@@ -6828,7 -6816,7 +6829,7 @@@ MAXIRADIO FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/radio/radio-maxiradio*
  
@@@ -6850,7 -6838,7 +6851,7 @@@ F:      drivers/media/platform/vsp1
  MEDIA DRIVERS FOR ASCOT2E
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6859,7 -6847,7 +6860,7 @@@ F:      drivers/media/dvb-frontends/ascot2e
  MEDIA DRIVERS FOR CXD2841ER
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6868,7 -6856,7 +6869,7 @@@ F:      drivers/media/dvb-frontends/cxd2841e
  MEDIA DRIVERS FOR HORUS3A
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6877,7 -6865,7 +6878,7 @@@ F:      drivers/media/dvb-frontends/horus3a
  MEDIA DRIVERS FOR LNBH25
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6886,7 -6874,7 +6887,7 @@@ F:      drivers/media/dvb-frontends/lnbh25
  MEDIA DRIVERS FOR NETUP PCI UNIVERSAL DVB devices
  M:    Sergey Kozlov <serjk@netup.ru>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    https://linuxtv.org
  W:    http://netup.tv/
  T:    git git://linuxtv.org/media_tree.git
  S:    Supported
@@@ -6896,7 -6884,7 +6897,7 @@@ MEDIA INPUT INFRASTRUCTURE (V4L/DVB
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  P:    LinuxTV.org Project
  L:    linux-media@vger.kernel.org
 -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
@@@ -6905,7 -6893,6 +6906,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
@@@ -7057,7 -7044,7 +7058,7 @@@ MIROSOUND PCM20 FM RADIO RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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*
  
@@@ -7093,7 -7080,7 +7094,7 @@@ F:      drivers/iio/temperature/mlx90614.
  MN88472 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -7104,7 -7091,7 +7105,7 @@@ F:      drivers/media/dvb-frontends/mn88472.
  MN88473 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -7159,7 -7146,7 +7160,7 @@@ F:      drivers/platform/x86/msi-wmi.
  MSI001 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -7169,7 -7156,7 +7170,7 @@@ F:      drivers/media/tuners/msi001
  MSI2500 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    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
@@@ -7188,7 -7175,7 +7189,7 @@@ L:      linux-media@vger.kernel.or
  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 <laurent.pinchart@ideasonboard.com>
@@@ -7196,7 -7183,7 +7197,7 @@@ L:      linux-media@vger.kernel.or
  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 <laurent.pinchart@ideasonboard.com>
@@@ -7204,7 -7191,7 +7205,7 @@@ L:      linux-media@vger.kernel.or
  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 <laurent.pinchart@ideasonboard.com>
@@@ -7213,7 -7200,7 +7214,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 <lee.jones@linaro.org>
@@@ -7257,7 -7244,7 +7258,7 @@@ F:      drivers/usb/musb
  MXL5007T MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -7382,13 -7369,6 +7383,13 @@@ F:    include/net/netrom.
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
  
 +NETRONOME ETHERNET DRIVERS
 +M:    Jakub Kicinski <jakub.kicinski@netronome.com>
 +M:    Rolf Neugebauer <rolf.neugebauer@netronome.com>
 +L:    oss-drivers@netronome.com
 +S:    Maintained
 +F:    drivers/net/ethernet/netronome/
 +
  NETWORK BLOCK DEVICE (NBD)
  M:    Markus Pargmann <mpa@pengutronix.de>
  S:    Maintained
@@@ -7520,12 -7500,7 +7521,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
@@@ -7975,7 -7950,7 +7976,7 @@@ L:      linux-wireless@vger.kernel.or
  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 <ooo@electrozaur.com>
@@@ -8001,7 -7976,7 +8002,7 @@@ M:      Christian Lamparter <chunkeey@google
  L:    linux-wireless@vger.kernel.org
  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 <olof@lixom.net>
@@@ -8312,7 -8287,7 +8313,7 @@@ F:      include/linux/delayacct.
  F:    kernel/delayacct.c
  
  PERFORMANCE EVENTS SUBSYSTEM
 -M:    Peter Zijlstra <a.p.zijlstra@chello.nl>
 +M:    Peter Zijlstra <peterz@infradead.org>
  M:    Ingo Molnar <mingo@redhat.com>
  M:    Arnaldo Carvalho de Melo <acme@kernel.org>
  L:    linux-kernel@vger.kernel.org
@@@ -8394,7 -8369,6 +8395,7 @@@ F:      drivers/pinctrl/intel
  
  PIN CONTROLLER - RENESAS
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
 +M:    Geert Uytterhoeven <geert+renesas@glider.be>
  L:    linux-sh@vger.kernel.org
  S:    Maintained
  F:    drivers/pinctrl/sh-pfc/
@@@ -8406,14 -8380,6 +8407,14 @@@ L:    linux-samsung-soc@vger.kernel.org (m
  S:    Maintained
  F:    drivers/pinctrl/samsung/
  
 +PIN CONTROLLER - SINGLE
 +M:    Tony Lindgren <tony@atomide.com>
 +M:    Haojian Zhuang <haojian.zhuang@linaro.org>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
 +F:    drivers/pinctrl/pinctrl-single.c
 +
  PIN CONTROLLER - ST SPEAR
  M:    Viresh Kumar <vireshk@kernel.org>
  L:    spear-devel@list.st.com
@@@ -8473,17 -8439,6 +8474,17 @@@ F:    fs/timerfd.
  F:    include/linux/timer*
  F:    kernel/time/*timer*
  
 +POWER MANAGEMENT CORE
 +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +L:    linux-pm@vger.kernel.org
 +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 <sre@kernel.org>
  M:    Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
@@@ -8563,7 -8518,7 +8564,7 @@@ M:      "Luis R. Rodriguez" <mcgrof@gmail.co
  L:    linux-wireless@vger.kernel.org
  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 <geoff@infradead.org>
@@@ -8676,7 -8631,6 +8677,7 @@@ 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
@@@ -8783,7 -8737,7 +8784,7 @@@ F:      include/uapi/linux/qnxtypes.
  QT1010 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -8867,7 -8821,7 +8868,7 @@@ M:      Stanislaw Gruszka <sgruszka@redhat.c
  M:    Helmut Schaa <helmut.schaa@googlemail.com>
  L:    linux-wireless@vger.kernel.org
  S:    Maintained
 -F:    drivers/net/wireless/rt2x00/
 +F:    drivers/net/wireless/ralink/rt2x00/
  
  RAMDISK RAM BLOCK DEVICE DRIVER
  M:    Jens Axboe <axboe@kernel.dk>
@@@ -8992,19 -8946,6 +8993,19 @@@ F:    drivers/rpmsg
  F:    Documentation/rpmsg.txt
  F:    include/linux/rpmsg.h
  
 +RENESAS ETHERNET DRIVERS
 +R:    Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
 +L:    netdev@vger.kernel.org
 +L:    linux-sh@vger.kernel.org
 +F:    drivers/net/ethernet/renesas/
 +F:    include/linux/sh_eth.h
 +
 +RENESAS USB2 PHY DRIVER
 +M:    Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 +L:    linux-sh@vger.kernel.org
 +S:    Maintained
 +F:    drivers/phy/phy-rcar-gen3-usb2.c
 +
  RESET CONTROLLER FRAMEWORK
  M:    Philipp Zabel <p.zabel@pengutronix.de>
  S:    Maintained
@@@ -9082,7 -9023,7 +9083,7 @@@ F:      net/rose
  RTL2830 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -9092,7 -9033,7 +9093,7 @@@ F:      drivers/media/dvb-frontends/rtl2830
  RTL2832 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -9102,7 -9043,7 +9103,7 @@@ F:      drivers/media/dvb-frontends/rtl2832
  RTL2832_SDR MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    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
@@@ -9114,7 -9055,7 +9115,7 @@@ L:      linux-wireless@vger.kernel.or
  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 <herton@canonical.com>
@@@ -9124,7 -9065,7 +9125,7 @@@ L:      linux-wireless@vger.kernel.or
  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 <Larry.Finger@lwfinger.net>
@@@ -9133,8 -9074,8 +9134,8 @@@ L:      linux-wireless@vger.kernel.or
  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 <Jes.Sorensen@redhat.com>
@@@ -9178,7 -9119,7 +9179,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 <ubraun@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -9208,7 -9149,7 +9209,7 @@@ S:      Supporte
  F:    drivers/s390/scsi/zfcp_*
  
  S390 IUCV NETWORK LAYER
 -M:    Ursula Braun <ursula.braun@de.ibm.com>
 +M:    Ursula Braun <ubraun@linux.vnet.ibm.com>
  L:    linux-s390@vger.kernel.org
  W:    http://www.ibm.com/developerworks/linux/linux390/
  S:    Supported
@@@ -9233,14 -9174,14 +9234,14 @@@ SAA6588 RDS RECEIVER DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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 <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    Documentation/video4linux/*.saa7134
@@@ -9285,10 -9226,8 +9286,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 <kyungmin.park@samsung.com>
@@@ -9304,7 -9243,7 +9305,7 @@@ L:      linux-media@vger.kernel.or
  L:    linux-samsung-soc@vger.kernel.org (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 <kyungmin.park@samsung.com>
@@@ -9412,7 -9351,7 +9413,7 @@@ M:      Andreas Noever <andreas.noever@gmail
  S:    Maintained
  F:    drivers/thunderbolt/
  
 -TIMEKEEPING, CLOCKSOURCE CORE, NTP
 +TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
  M:    John Stultz <john.stultz@linaro.org>
  M:    Thomas Gleixner <tglx@linutronix.de>
  L:    linux-kernel@vger.kernel.org
@@@ -9425,7 -9364,6 +9426,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/
  
@@@ -9490,10 -9428,8 +9491,10 @@@ F:    include/scsi/sg.
  
  SCSI SUBSYSTEM
  M:    "James E.J. Bottomley" <JBottomley@odin.com>
 -L:    linux-scsi@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git
 +M:    "Martin K. Petersen" <martin.petersen@oracle.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git
 +L:    linux-scsi@vger.kernel.org
  S:    Maintained
  F:    drivers/scsi/
  F:    include/scsi/
@@@ -9680,7 -9616,7 +9681,7 @@@ F:      drivers/misc/sgi-xp
  SI2157 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    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
@@@ -9690,7 -9626,7 +9691,7 @@@ F:      drivers/media/tuners/si2157
  SI2168 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 +W:    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
@@@ -9701,7 -9637,7 +9702,7 @@@ SI470X FM RADIO RECEIVER I2C DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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
  
@@@ -9709,7 -9645,7 +9710,7 @@@ SI470X FM RADIO RECEIVER USB DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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
@@@ -9719,7 -9655,7 +9720,7 @@@ SI4713 FM RADIO TRANSMITTER I2C DRIVE
  M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-media@vger.kernel.org
  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.?
  
@@@ -9727,7 -9663,7 +9728,7 @@@ SI4713 FM RADIO TRANSMITTER PLATFORM DR
  M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-media@vger.kernel.org
  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
  
@@@ -9735,14 -9671,14 +9736,14 @@@ SI4713 FM RADIO TRANSMITTER USB DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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 <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/common/siano/
@@@ -9767,7 -9703,7 +9768,7 @@@ SH_VOU V4L2 OUTPUT DRIVE
  L:    linux-media@vger.kernel.org
  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 <lenb@kernel.org>
@@@ -9808,7 -9744,7 +9809,7 @@@ F:      drivers/i2c/busses/i2c-davinci.
  TI DAVINCI SERIES MEDIA DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
 -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
@@@ -9818,7 -9754,7 +9819,7 @@@ F:      include/media/davinci
  TI AM437X VPFE DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
 -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
@@@ -9827,12 -9763,12 +9828,12 @@@ F:   drivers/media/platform/am437x
  OV2659 OMNIVISION SENSOR DRIVER
  M:    "Lad, Prabhakar" <prabhakar.csengg@gmail.com>
  L:    linux-media@vger.kernel.org
 -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 <sudipm.mukherjee@gmail.com>
@@@ -9921,7 -9857,7 +9922,7 @@@ M:      Sakari Ailus <sakari.ailus@iki.fi
  L:    linux-media@vger.kernel.org
  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
@@@ -10085,7 -10021,7 +10086,7 @@@ F:   sound/soc/soc-generic-dmaengine-pcm.
  SP2 MEDIA DRIVER
  M:    Olli Salonen <olli.salonen@iki.fi>
  L:    linux-media@vger.kernel.org
 -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*
@@@ -10447,7 -10383,7 +10448,7 @@@ F:   net/ipv4/tcp_lp.
  TDA10071 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -10457,7 -10393,7 +10458,7 @@@ F:   drivers/media/dvb-frontends/tda10071
  TDA18212 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -10467,7 -10403,7 +10468,7 @@@ F:   drivers/media/tuners/tda18212
  TDA18218 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -10477,7 -10413,7 +10478,7 @@@ F:   drivers/media/tuners/tda18218
  TDA18271 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -10487,7 -10423,7 +10488,7 @@@ F:   drivers/media/tuners/tda18271
  TDA827x MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -10497,7 -10433,7 +10498,7 @@@ F:   drivers/media/tuners/tda8290.
  TDA8290 MEDIA DRIVER
  M:    Michael Krufky <mkrufky@linuxtv.org>
  L:    linux-media@vger.kernel.org
 -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
@@@ -10508,14 -10444,14 +10509,14 @@@ TDA9840 MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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 <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/tuners/tea5761.*
@@@ -10523,7 -10459,7 +10524,7 @@@
  TEA5767 TUNER DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/tuners/tea5767.*
@@@ -10532,7 -10468,7 +10533,7 @@@ TEA6415C MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tea6415c*
  
@@@ -10540,7 -10476,7 +10541,7 @@@ TEA6420 MEDIA DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/i2c/tea6420*
  
@@@ -10638,7 -10574,7 +10639,7 @@@ THANKO'S RAREMONO AM/FM/SW RADIO RECEIV
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  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
  
@@@ -10862,7 -10798,7 +10863,7 @@@ M:   Mats Randgaard <matrandg@cisco.com
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/i2c/tc358743*
 -F:    include/media/tc358743.h
 +F:    include/media/i2c/tc358743.h
  
  TMIO MMC DRIVER
  M:    Ian Molton <ian@mnementh.co.uk>
@@@ -10890,7 -10826,7 +10891,7 @@@ F:   mm/shmem.
  TM6000 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Odd fixes
  F:    drivers/media/usb/tm6000/
@@@ -10899,7 -10835,7 +10900,7 @@@ TW68 VIDEO4LINUX DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/pci/tw68/
  
@@@ -10960,7 -10896,7 +10961,7 @@@ F:   include/uapi/linux/tty.
  TUA9001 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
 -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
@@@ -10968,9 -10904,9 +10969,9 @@@ S:   Maintaine
  F:    drivers/media/tuners/tua9001*
  
  TULIP NETWORK DRIVERS
 -M:    Grant Grundler <grundler@parisc-linux.org>
  L:    netdev@vger.kernel.org
 -S:    Maintained
 +L:    linux-parisc@vger.kernel.org
 +S:    Orphan
  F:    drivers/net/ethernet/dec/tulip/
  
  TUN/TAP driver
@@@ -11162,6 -11098,7 +11163,7 @@@ F:   include/linux/usb/gadget
  
  USB HID/HIDBP DRIVERS (USB KEYBOARDS, MICE, REMOTE CONTROLS, ...)
  M:    Jiri Kosina <jikos@kernel.org>
+ R:    Benjamin Tissoires <benjamin.tissoires@redhat.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git
  S:    Maintained
@@@ -11203,7 -11140,7 +11205,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:    linux-usb@vger.kernel.org
  S:    Maintained
@@@ -11239,13 -11176,6 +11241,13 @@@ L: linux-usb@vger.kernel.or
  S:    Supported
  F:    drivers/usb/class/usblp.c
  
 +USB QMI WWAN NETWORK DRIVER
 +M:    Bjørn Mork <bjorn@mork.no>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-class-net-qmi
 +F:    drivers/net/usb/qmi_wwan.c
 +
  USB RTL8150 DRIVER
  M:    Petko Manolov <petkan@nucleusys.com>
  L:    linux-usb@vger.kernel.org
@@@ -11314,7 -11244,7 +11316,7 @@@ USB VISION DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Odd Fixes
  F:    drivers/media/usb/usbvision/
  
@@@ -11342,7 -11272,7 +11344,7 @@@ USB ZD1201 DRIVE
  L:    linux-wireless@vger.kernel.org
  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 <royale@zerezo.com>
@@@ -11528,7 -11458,7 +11530,7 @@@ VIVID VIRTUAL VIDEO DRIVE
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  S:    Maintained
  F:    drivers/media/platform/vivid/*
  
@@@ -11745,7 -11675,6 +11747,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
@@@ -11759,7 -11688,6 +11761,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 <tj@kernel.org>
@@@ -11819,7 -11747,7 +11821,7 @@@ F:   arch/x86/entry/vdso
  XC2028/3028 TUNER DRIVER
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org
 +W:    https://linuxtv.org
  T:    git git://linuxtv.org/media_tree.git
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
@@@ -11975,7 -11903,7 +11977,7 @@@ W:   http://zd1211.ath.cx/wiki/DriverRewr
  L:    linux-wireless@vger.kernel.org
  L:    zd1211-devs@lists.sourceforge.net (subscribers-only)
  S:    Maintained
 -F:    drivers/net/wireless/zd1211rw/
 +F:    drivers/net/wireless/zydas/zd1211rw/
  
  ZPOOL COMPRESSED PAGE STORAGE API
  M:    Dan Streetman <ddstreet@ieee.org>
@@@ -11988,7 -11916,7 +11990,7 @@@ ZR36067 VIDEO FOR LINUX DRIVE
  L:    mjpeg-users@lists.sourceforge.net
  L:    linux-media@vger.kernel.org
  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/hid/hid-ids.h
index 8b78a7f1f779faa586abd156a0f9ce7082616bc5,242ec4f4d8b028388f357dcb4a8baf1141f109ec..b6ff6e78ac54e281a8617212024147d63c891346
--- 1/drivers/hid/hid-ids.h
--- 2/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
@@@ -316,6 -316,11 +316,6 @@@
  #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH_A001     0xa001
  
  #define USB_VENDOR_ID_ELAN            0x04f3
 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN        0x0089
 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_009B   0x009b
 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_0103   0x0103
 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_010c   0x010c
 -#define USB_DEVICE_ID_ELAN_TOUCHSCREEN_016F   0x016f
  
  #define USB_VENDOR_ID_ELECOM          0x056e
  #define USB_DEVICE_ID_ELECOM_BM084    0x0061
@@@ -510,6 -515,7 +510,7 @@@
  #define USB_VENDOR_ID_ITE               0x048d
  #define USB_DEVICE_ID_ITE_LENOVO_YOGA   0x8386
  #define USB_DEVICE_ID_ITE_LENOVO_YOGA2  0x8350
+ #define USB_DEVICE_ID_ITE_LENOVO_YOGA900      0x8396
  
  #define USB_VENDOR_ID_JABRA           0x0b0e
  #define USB_DEVICE_ID_JABRA_SPEAK_410 0x0412
@@@ -615,6 -621,7 +616,7 @@@
  #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2     0xc218
  #define USB_DEVICE_ID_LOGITECH_RUMBLEPAD2_2   0xc219
  #define USB_DEVICE_ID_LOGITECH_G29_WHEEL      0xc24f
+ #define USB_DEVICE_ID_LOGITECH_G920_WHEEL     0xc262
  #define USB_DEVICE_ID_LOGITECH_WINGMAN_F3D    0xc283
  #define USB_DEVICE_ID_LOGITECH_FORCE3D_PRO    0xc286
  #define USB_DEVICE_ID_LOGITECH_FLIGHT_SYSTEM_G940     0xc287
@@@ -664,6 -671,7 +666,7 @@@
  #define USB_DEVICE_ID_PICOLCD         0xc002
  #define USB_DEVICE_ID_PICOLCD_BOOTLOADER      0xf002
  #define USB_DEVICE_ID_PICK16F1454     0x0042
+ #define USB_DEVICE_ID_PICK16F1454_V2  0xf2f7
  
  #define USB_VENDOR_ID_MICROSOFT               0x045e
  #define USB_DEVICE_ID_SIDEWINDER_GV   0x003b