Merge ath-current from ath.git

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 917f27f..a26b9fe 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -206,7 +206,7 @@ F:  include/trace/events/9p.h
 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
@@ -240,6 +240,12 @@ L: lm-sensors@lm-sensors.org
 S:     Maintained
 F:     drivers/hwmon/abituguru3.c
 
+ACCES 104-IDI-48 GPIO DRIVER
+M:     "William Breathitt Gray" <vilhelm.gray@gmail.com>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-104-idi-48.c
+
 ACCES 104-IDIO-16 GPIO DRIVER
 M:     "William Breathitt Gray" <vilhelm.gray@gmail.com>
 L:     linux-gpio@vger.kernel.org
@@ -371,6 +377,15 @@ ADDRESS SPACE LAYOUT RANDOMIZATION (ASLR)
 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
@@ -388,14 +403,14 @@ ADM8211 WIRELESS DRIVER
 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>
@@ -466,7 +481,7 @@ F:  sound/oss/aedsp16.c
 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
@@ -476,7 +491,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
@@ -522,7 +537,7 @@ AIMSLAB FM RADIO RECEIVER 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-aimslab*
 
@@ -536,7 +551,7 @@ F:  include/linux/*aio*.h
 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
@@ -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:     lm-sensors@lm-sensors.org
-S:     Maintained
+S:     Supported
 F:     Documentation/hwmon/fam15h_power
 F:     drivers/hwmon/fam15h_power.c
 
@@ -1773,7 +1788,7 @@ L:        linux-media@vger.kernel.org
 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>
@@ -1896,7 +1911,6 @@ ATMEL AT91 / AT32 MCI DRIVER
 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>
@@ -1993,7 +2007,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -2064,7 +2078,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
@@ -2073,7 +2087,7 @@ AZTECH FM RADIO RECEIVER 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-aztech*
 
@@ -2082,7 +2096,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -2090,7 +2104,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -2102,7 +2116,7 @@ F:        include/linux/backlight.h
 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
@@ -2126,7 +2140,7 @@ BDISP ST MEDIA DRIVER
 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
 
@@ -2392,7 +2406,7 @@ M:        Hante Meuleman <meuleman@broadcom.com>
 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
@@ -2519,7 +2533,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/
@@ -2558,7 +2572,7 @@ CADET FM/AM RADIO RECEIVER 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-cadet*
 
@@ -2759,7 +2773,7 @@ S:        Maintained
 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
@@ -2851,7 +2865,7 @@ COBALT MEDIA DRIVER
 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/
 
@@ -2939,7 +2953,8 @@ F:        drivers/usb/atm/cxacru.c
 
 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
@@ -3096,6 +3111,15 @@ S:       Maintained
 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
@@ -3104,14 +3128,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
@@ -3122,7 +3146,7 @@ CX2341X MPEG ENCODER HELPER MODULE
 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*
@@ -3131,7 +3155,7 @@ CX24120 MEDIA DRIVER
 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*
@@ -3139,7 +3163,7 @@ F:        drivers/media/dvb-frontends/cx24120*
 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/
@@ -3148,7 +3172,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
@@ -3254,7 +3278,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
@@ -3744,6 +3768,15 @@ S:       Maintained
 F:     drivers/gpu/drm/sti
 F:     Documentation/devicetree/bindings/display/st,stih4xx.txt
 
+DRM DRIVERS FOR VIVANTE GPU IP
+M:     Lucas Stach <l.stach@pengutronix.de>
+R:     Russell King <linux+etnaviv@arm.linux.org.uk>
+R:     Christian Gmeiner <christian.gmeiner@gmail.com>
+L:     dri-devel@lists.freedesktop.org
+S:     Maintained
+F:     drivers/gpu/drm/etnaviv
+F:     Documentation/devicetree/bindings/display/etnaviv
+
 DSBR100 USB FM RADIO DRIVER
 M:     Alexey Klimov <klimov.linux@gmail.com>
 L:     linux-media@vger.kernel.org
@@ -3761,14 +3794,14 @@ DT3155 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
+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
@@ -3778,7 +3811,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
@@ -3788,7 +3821,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
@@ -3798,7 +3831,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
@@ -3808,7 +3841,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
@@ -3818,7 +3851,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
@@ -3828,7 +3861,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
@@ -3838,7 +3871,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
@@ -3847,7 +3880,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
@@ -3857,7 +3890,7 @@ F:        drivers/media/usb/dvb-usb-v2/mxl111sf*
 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
@@ -3867,7 +3900,7 @@ F:        drivers/media/usb/dvb-usb-v2/rtl28xxu*
 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
@@ -3897,7 +3930,7 @@ F:        Documentation/devicetree/bindings/input/e3x0-button.txt
 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
@@ -3913,7 +3946,7 @@ F:        drivers/scsi/eata.c
 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
@@ -3934,9 +3967,8 @@ M:        Doug Thompson <dougthompson@xmission.com>
 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/
@@ -3946,7 +3978,6 @@ EDAC-AMD64
 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*
 
@@ -3954,7 +3985,6 @@ EDAC-CALXEDA
 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*
 
@@ -3963,7 +3993,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*
 
@@ -3971,63 +4000,54 @@ EDAC-E752X
 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
 
@@ -4035,42 +4055,36 @@ EDAC-I82975X
 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
 
@@ -4137,7 +4151,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/
@@ -4277,7 +4291,7 @@ F:        drivers/media/tuners/fc0011.c
 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
@@ -4491,8 +4505,9 @@ F:        include/linux/fs_enet_pd.h
 FREESCALE QUICC ENGINE LIBRARY
 L:     linuxppc-dev@lists.ozlabs.org
 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 <leoli@freescale.com>
@@ -4600,7 +4615,7 @@ M:        Heungjun Kim <riverful.kim@samsung.com>
 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>
@@ -4646,7 +4661,7 @@ GEMTEK FM RADIO RECEIVER 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-gemtek*
 
@@ -4854,7 +4869,7 @@ HDPVR USB VIDEO ENCODER 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
+W:     https://linuxtv.org
 S:     Odd Fixes
 F:     drivers/media/usb/hdpvr/
 
@@ -4873,7 +4888,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
@@ -4916,7 +4931,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
@@ -4985,6 +5000,7 @@ F:        arch/*/include/asm/suspend*.h
 
 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
@@ -5039,13 +5055,20 @@ F:      include/uapi/linux/if_hippi.h
 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
@@ -5283,6 +5306,13 @@ L:       netdev@vger.kernel.org
 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
@@ -5613,7 +5643,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -5622,9 +5652,7 @@ F:        Documentation/trace/intel_th.txt
 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
@@ -5647,7 +5675,7 @@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
 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>
@@ -5657,7 +5685,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -5822,7 +5850,7 @@ ISA RADIO MODULE
 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*
 
@@ -5892,7 +5920,7 @@ F:        drivers/hwmon/it87.c
 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
@@ -5913,7 +5941,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*
@@ -6002,7 +6030,7 @@ KEENE FM RADIO TRANSMITTER 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-keene*
 
@@ -6102,6 +6130,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*
@@ -6254,7 +6283,7 @@ F:        drivers/usb/misc/legousbtower.c
 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
@@ -6264,7 +6293,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
@@ -6431,7 +6460,7 @@ S:        Maintained
 F:     arch/powerpc/platforms/8xx/
 
 LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX
-M:     Scott Wood <scottwood@freescale.com>
+M:     Scott Wood <oss@buserror.net>
 M:     Kumar Gala <galak@kernel.crashing.org>
 W:     http://www.penguinppc.org/
 L:     linuxppc-dev@lists.ozlabs.org
@@ -6521,7 +6550,7 @@ F:        drivers/hwmon/lm95234.c
 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*
@@ -6627,7 +6656,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
@@ -6637,7 +6666,7 @@ F:        drivers/media/dvb-frontends/m88ds3103*
 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*
@@ -6708,7 +6737,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>
@@ -6728,13 +6757,13 @@ M:      Amitkumar Karwar <akarwar@marvell.com>
 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>
@@ -6816,7 +6845,7 @@ MAXIRADIO FM RADIO RECEIVER 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-maxiradio*
 
@@ -6838,7 +6867,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
@@ -6847,7 +6876,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
@@ -6856,7 +6885,7 @@ F:        drivers/media/dvb-frontends/cxd2841er*
 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
@@ -6865,7 +6894,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
@@ -6874,7 +6903,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
@@ -6884,7 +6913,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
@@ -6893,6 +6922,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
@@ -7044,7 +7074,7 @@ MIROSOUND PCM20 FM RADIO RECEIVER 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
+W:     https://linuxtv.org
 S:     Odd Fixes
 F:     drivers/media/radio/radio-miropcm20*
 
@@ -7080,7 +7110,7 @@ F:        drivers/iio/temperature/mlx90614.c
 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
@@ -7091,7 +7121,7 @@ F:        drivers/media/dvb-frontends/mn88472.h
 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
@@ -7146,7 +7176,7 @@ F:        drivers/platform/x86/msi-wmi.c
 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
@@ -7156,7 +7186,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
@@ -7175,7 +7205,7 @@ L:        linux-media@vger.kernel.org
 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>
@@ -7183,7 +7213,7 @@ L:        linux-media@vger.kernel.org
 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>
@@ -7191,7 +7221,7 @@ L:        linux-media@vger.kernel.org
 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>
@@ -7200,7 +7230,7 @@ T:        git git://linuxtv.org/media_tree.git
 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>
@@ -7244,7 +7274,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
@@ -7369,6 +7399,13 @@ F:       include/net/netrom.h
 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
@@ -7500,7 +7537,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
@@ -7794,11 +7836,12 @@ F:      drivers/usb/*/*omap*
 F:     arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
-M:     Javier Martinez Canillas <javier@dowhile0.org>
+M:     Grygorii Strashko <grygorii.strashko@ti.com>
 M:     Santosh Shilimkar <ssantosh@kernel.org>
 M:     Kevin Hilman <khilman@deeprootsystems.com>
 L:     linux-omap@vger.kernel.org
 S:     Maintained
+F:     Documentation/devicetree/bindings/gpio/gpio-omap.txt
 F:     drivers/gpio/gpio-omap.c
 
 OMAP/NEWFLOW NANOBONE MACHINE SUPPORT
@@ -7950,7 +7993,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -7976,7 +8019,7 @@ M:        Christian Lamparter <chunkeey@googlemail.com>
 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>
@@ -8369,6 +8412,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/
@@ -8447,6 +8491,17 @@ F:       fs/timerfd.c
 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>
@@ -8526,7 +8581,7 @@ M:        "Luis R. Rodriguez" <mcgrof@gmail.com>
 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>
@@ -8639,12 +8694,19 @@ S:      Maintained
 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 <robert.jarzmik@free.fr>
+L:     linux-gpio@vger.kernel.org
+S:     Maintained
+F:     drivers/gpio/gpio-pxa.c
+
 PXA3xx NAND FLASH DRIVER
 M:     Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
 L:     linux-mtd@lists.infradead.org
@@ -8745,7 +8807,7 @@ F:        include/uapi/linux/qnxtypes.h
 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
@@ -8829,7 +8891,7 @@ M:        Stanislaw Gruszka <sgruszka@redhat.com>
 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>
@@ -8961,6 +9023,12 @@ 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
@@ -9038,7 +9106,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
@@ -9048,7 +9116,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
@@ -9058,7 +9126,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
@@ -9070,7 +9138,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -9080,7 +9148,7 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -9089,8 +9157,8 @@ L:        linux-wireless@vger.kernel.org
 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>
@@ -9134,7 +9202,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
@@ -9164,7 +9232,7 @@ S:        Supported
 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
@@ -9189,14 +9257,14 @@ SAA6588 RDS RECEIVER 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
+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
@@ -9241,8 +9309,10 @@ F:       drivers/regulator/s5m*.c
 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>
@@ -9258,7 +9328,7 @@ L:        linux-media@vger.kernel.org
 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>
@@ -9366,7 +9436,7 @@ M:        Andreas Noever <andreas.noever@gmail.com>
 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
@@ -9379,6 +9449,7 @@ F:        include/uapi/linux/time.h
 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/
 
@@ -9633,7 +9704,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
@@ -9643,7 +9714,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
@@ -9654,7 +9725,7 @@ SI470X FM RADIO RECEIVER I2C 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
+W:     https://linuxtv.org
 S:     Odd Fixes
 F:     drivers/media/radio/si470x/radio-si470x-i2c.c
 
@@ -9662,7 +9733,7 @@ SI470X FM RADIO RECEIVER USB 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/si470x/radio-si470x-common.c
 F:     drivers/media/radio/si470x/radio-si470x.h
@@ -9672,7 +9743,7 @@ SI4713 FM RADIO TRANSMITTER I2C DRIVER
 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.?
 
@@ -9680,7 +9751,7 @@ SI4713 FM RADIO TRANSMITTER PLATFORM DRIVER
 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
 
@@ -9688,14 +9759,14 @@ SI4713 FM RADIO TRANSMITTER USB 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
+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/
@@ -9720,7 +9791,7 @@ SH_VOU V4L2 OUTPUT DRIVER
 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>
@@ -9761,7 +9832,7 @@ F:        drivers/i2c/busses/i2c-davinci.c
 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
@@ -9771,7 +9842,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
@@ -9780,12 +9851,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>
@@ -9874,7 +9945,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
@@ -9965,7 +10036,7 @@ F:       drivers/net/ethernet/natsemi/sonic.*
 
 SONICS SILICON BACKPLANE DRIVER (SSB)
 M:     Michael Buesch <m@bues.ch>
-L:     netdev@vger.kernel.org
+L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F:     drivers/ssb/
 F:     include/linux/ssb/
@@ -10037,7 +10108,7 @@ F:      sound/soc/soc-generic-dmaengine-pcm.c
 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*
@@ -10399,7 +10470,7 @@ F:      net/ipv4/tcp_lp.c
 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
@@ -10409,7 +10480,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
@@ -10419,7 +10490,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
@@ -10429,7 +10500,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
@@ -10439,7 +10510,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
@@ -10449,7 +10520,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
@@ -10460,14 +10531,14 @@ TDA9840 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
+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.*
@@ -10475,7 +10546,7 @@ F:      drivers/media/tuners/tea5761.*
 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.*
@@ -10484,7 +10555,7 @@ TEA6415C 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/i2c/tea6415c*
 
@@ -10492,7 +10563,7 @@ TEA6420 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/i2c/tea6420*
 
@@ -10590,7 +10661,7 @@ THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/radio/radio-raremono.c
 
@@ -10740,6 +10811,7 @@ F:      net/tipc/
 TILE ARCHITECTURE
 M:     Chris Metcalf <cmetcalf@ezchip.com>
 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
@@ -10814,7 +10886,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>
@@ -10842,7 +10914,7 @@ F:      mm/shmem.c
 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/
@@ -10851,7 +10923,7 @@ TW68 VIDEO4LINUX 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
+W:     https://linuxtv.org
 S:     Odd Fixes
 F:     drivers/media/pci/tw68/
 
@@ -10912,7 +10984,7 @@ F:      include/uapi/linux/tty.h
 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
@@ -11114,6 +11186,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
@@ -11155,7 +11228,7 @@ F:      Documentation/usb/ohci.txt
 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
@@ -11191,6 +11264,13 @@ L:     linux-usb@vger.kernel.org
 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
@@ -11259,7 +11339,7 @@ USB VISION 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
+W:     https://linuxtv.org
 S:     Odd Fixes
 F:     drivers/media/usb/usbvision/
 
@@ -11287,7 +11367,7 @@ USB ZD1201 DRIVER
 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>
@@ -11473,7 +11553,7 @@ VIVID VIRTUAL VIDEO 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
+W:     https://linuxtv.org
 S:     Maintained
 F:     drivers/media/platform/vivid/*
 
@@ -11619,6 +11699,7 @@ F:      drivers/input/tablet/wacom_serial4.c
 
 WATCHDOG DEVICE DRIVERS
 M:     Wim Van Sebroeck <wim@iguana.be>
+R:     Guenter Roeck <linux@roeck-us.net>
 L:     linux-watchdog@vger.kernel.org
 W:     http://www.linux-watchdog.org/
 T:     git git://www.linux-watchdog.org/linux-watchdog.git
@@ -11690,6 +11771,7 @@ F:      drivers/input/touchscreen/wm831x-ts.c
 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
@@ -11703,6 +11785,7 @@ F:      include/linux/wm97xx.h
 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>
@@ -11762,7 +11845,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.*
@@ -11918,7 +12001,7 @@ W:      http://zd1211.ath.cx/wiki/DriverRewrite
 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>
@@ -11931,7 +12014,7 @@ ZR36067 VIDEO FOR LINUX DRIVER
 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/