From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Apr 2021 01:57:29 +0000 (+1000)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=869c74bc9d5e1ceef7cc460569dbda579fe7f767;p=users%2Fjedix%2Flinux-maple.git

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

# Conflicts:
#	MAINTAINERS
---

869c74bc9d5e1ceef7cc460569dbda579fe7f767
diff --cc MAINTAINERS
index b7db7e9662b1,cb727179826b..7e22b710682d
--- a/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