Merge remote-tracking branch 'v4l-dvb/master'

# Conflicts:
#	MAINTAINERS

diff --cc MAINTAINERS
index b7db7e9662b17d332ffa8ec82d118a713873cd6e,cb727179826b19962cb0bca4497d6cc8dfca6405..7e22b710682d6dff144a5e894b6ee9b22bd0eb0e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -12999,13 -12910,14 +12999,21 @@@ L:        linux-nfc@lists.01.org (moderated fo
  S:    Supported
  F:    drivers/nfc/nxp-nci
  
+ NXP i.MX 8QXP/8QM JPEG V4L2 DRIVER
+ M:    Mirela Rabulea <mirela.rabulea@nxp.com>
+ R:    NXP Linux Team <linux-imx@nxp.com>
+ L:    linux-media@vger.kernel.org
+ S:    Maintained
+ F:    Documentation/devicetree/bindings/media/imx8-jpeg.yaml
+ F:    drivers/media/platform/imx-jpeg
+ 
 +NZXT-KRAKEN2 HARDWARE MONITORING DRIVER
 +M:    Jonas Malaco <jonas@protocubo.io>
 +L:    linux-hwmon@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/hwmon/nzxt-kraken2.rst
 +F:    drivers/hwmon/nzxt-kraken2.c
 +
  OBJAGG
  M:    Jiri Pirko <jiri@nvidia.com>
  L:    netdev@vger.kernel.org

diff --cc drivers/media/pci/cx25821/cx25821-alsa.c
Simple merge

diff --cc drivers/media/pci/ivtv/ivtv-driver.c
Simple merge

diff --cc drivers/media/platform/coda/coda-common.c
Simple merge

diff --cc drivers/media/platform/rockchip/rkisp1/rkisp1-params.c
Simple merge

diff --cc drivers/media/rc/Makefile
Simple merge

diff --cc drivers/media/rc/keymaps/Makefile
Simple merge

diff --cc include/media/rc-map.h
Simple merge