media: ipu3-cio2: Add cio2-bridge to ipu3-cio2 driver

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 154c870..138aaaf 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -699,7 +699,8 @@ M:  Michael Tretter <m.tretter@pengutronix.de>
 R:     Pengutronix Kernel Team <kernel@pengutronix.de>
 L:     linux-media@vger.kernel.org
 S:     Maintained
-F:     drivers/staging/media/allegro-dvt/
+F:     Documentation/devicetree/bindings/media/allegro,al5e.yaml
+F:     drivers/media/platform/allegro-dvt/
 
 ALLWINNER A10 CSI DRIVER
 M:     Maxime Ripard <mripard@kernel.org>
@@ -9013,9 +9014,11 @@ INTEL IPU3 CSI-2 CIO2 DRIVER
 M:     Yong Zhi <yong.zhi@intel.com>
 M:     Sakari Ailus <sakari.ailus@linux.intel.com>
 M:     Bingbu Cao <bingbu.cao@intel.com>
+M:     Dan Scally <djrscally@gmail.com>
 R:     Tianshu Qiu <tian.shu.qiu@intel.com>
 L:     linux-media@vger.kernel.org
 S:     Maintained
+T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/userspace-api/media/v4l/pixfmt-srggb10-ipu3.rst
 F:     drivers/media/pci/intel/ipu3/
 
@@ -11552,7 +11555,7 @@ L:      linux-amlogic@lists.infradead.org
 S:     Supported
 T:     git git://linuxtv.org/media_tree.git
 F:     Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
-F:     drivers/media/meson/ge2d/
+F:     drivers/media/platform/meson/ge2d/
 
 MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 M:     Liang Yang <liang.yang@amlogic.com>
@@ -11835,9 +11838,11 @@ L:     linux-media@vger.kernel.org
 S:     Maintained
 F:     Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
 F:     Documentation/driver-api/media/drivers/ccs/
+F:     Documentation/userspace-api/media/drivers/ccs.rst
 F:     drivers/media/i2c/ccs-pll.c
 F:     drivers/media/i2c/ccs-pll.h
 F:     drivers/media/i2c/ccs/
+F:     include/uapi/linux/ccs.h
 F:     include/uapi/linux/smiapp.h
 
 MIPS
@@ -13114,7 +13119,7 @@ M:      Jacopo Mondi <jacopo@jmondi.org>
 L:     linux-media@vger.kernel.org
 S:     Maintained
 T:     git git://linuxtv.org/media_tree.git
-F:     Documentation/devicetree/bindings/media/i2c/ov5647.yaml
+F:     Documentation/devicetree/bindings/media/i2c/ovti,ov5647.yaml
 F:     drivers/media/i2c/ov5647.c
 
 OMNIVISION OV5670 SENSOR DRIVER
@@ -16917,6 +16922,22 @@ M:     Ion Badulescu <ionut@badula.org>
 S:     Odd Fixes
 F:     drivers/net/ethernet/adaptec/starfire*
 
+STATIC BRANCH/CALL
+M:     Peter Zijlstra <peterz@infradead.org>
+M:     Josh Poimboeuf <jpoimboe@redhat.com>
+M:     Jason Baron <jbaron@akamai.com>
+R:     Steven Rostedt <rostedt@goodmis.org>
+R:     Ard Biesheuvel <ardb@kernel.org>
+S:     Supported
+F:     arch/*/include/asm/jump_label*.h
+F:     arch/*/include/asm/static_call*.h
+F:     arch/*/kernel/jump_label.c
+F:     arch/*/kernel/static_call.c
+F:     include/linux/jump_label*.h
+F:     include/linux/static_call*.h
+F:     kernel/jump_label.c
+F:     kernel/static_call.c
+
 STEC S1220 SKD DRIVER
 M:     Damien Le Moal <Damien.LeMoal@wdc.com>
 L:     linux-block@vger.kernel.org