Merge branch 'patchwork' into v4l_for_linus

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6889a6dbb42ddfb19531cc7687eae048346b9244..741c807b28d71b5683438cabcd1c894365e3118f 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
@@ -395,7 +395,7 @@ 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 +466,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 +476,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 +522,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 +536,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
@@ -1773,7 +1773,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>
@@ -2064,7 +2064,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 +2073,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*
 
@@ -2126,7 +2126,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
 
@@ -2519,7 +2519,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 +2558,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*
 
@@ -2851,7 +2851,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/
 
@@ -3096,6 +3096,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
@@ -3111,7 +3120,7 @@ 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 +3131,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 +3140,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 +3148,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 +3157,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 +3263,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
@@ -3761,14 +3770,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 +3787,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 +3797,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 +3807,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 +3817,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 +3827,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 +3837,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 +3847,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 +3856,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 +3866,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 +3876,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 +3906,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 +3922,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
@@ -4137,7 +4146,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 +4286,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
@@ -4600,7 +4609,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 +4655,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 +4863,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 +4882,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 +4925,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
@@ -5822,7 +5831,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 +5901,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 +5922,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 +6011,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*
 
@@ -6254,7 +6263,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 +6273,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
@@ -6521,7 +6530,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 +6636,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 +6646,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*
@@ -6816,7 +6825,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 +6847,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 +6856,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 +6865,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 +6874,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 +6883,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 +6893,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 +6902,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 +7054,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 +7090,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 +7101,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 +7156,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 +7166,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 +7185,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 +7193,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 +7201,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 +7210,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 +7254,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
@@ -8380,6 +8390,14 @@ L:       linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 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
@@ -8737,7 +8755,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
@@ -9030,7 +9048,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
@@ -9040,7 +9058,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
@@ -9050,7 +9068,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
@@ -9181,14 +9199,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
@@ -9250,7 +9268,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>
@@ -9625,7 +9643,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
@@ -9635,7 +9653,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
@@ -9646,7 +9664,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
 
@@ -9654,7 +9672,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
@@ -9664,7 +9682,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.?
 
@@ -9672,7 +9690,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
 
@@ -9680,14 +9698,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/
@@ -9712,7 +9730,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>
@@ -9753,7 +9771,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
@@ -9763,7 +9781,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
@@ -9772,12 +9790,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>
@@ -9866,7 +9884,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
@@ -10030,7 +10048,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*
@@ -10392,7 +10410,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
@@ -10402,7 +10420,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
@@ -10412,7 +10430,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
@@ -10422,7 +10440,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
@@ -10432,7 +10450,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
@@ -10442,7 +10460,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
@@ -10453,14 +10471,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.*
@@ -10468,7 +10486,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.*
@@ -10477,7 +10495,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*
 
@@ -10485,7 +10503,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*
 
@@ -10583,7 +10601,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
 
@@ -10807,7 +10825,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>
@@ -10835,7 +10853,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/
@@ -10844,7 +10862,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/
 
@@ -10905,7 +10923,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
@@ -11252,7 +11270,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/
 
@@ -11466,7 +11484,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/*
 
@@ -11755,7 +11773,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.*
@@ -11924,7 +11942,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/