diff options
| author | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-07 17:38:29 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@kernel.org> | 2022-03-07 17:38:36 +0100 |
| commit | b3627647f9ea7473d10fb08a95fd7c4133a17ca4 (patch) | |
| tree | 9eaa6eb7a506b16b22a1c32c8599a3bd9cc329c4 /MAINTAINERS | |
| parent | 92ec1a5c275acf8ec9999b7969a14745def5a8da (diff) | |
| parent | 25e94139218c0293b4375233c14f2256d7dcfaa8 (diff) | |
| download | linux-b3627647f9ea7473d10fb08a95fd7c4133a17ca4.tar.bz2 | |
Merge tag 'br-v5.18s' of git://linuxtv.org/hverkuil/media_tree into media_stage
Tag branch
* tag 'br-v5.18s' of git://linuxtv.org/hverkuil/media_tree:
ivtv: fix incorrect device_caps for ivtvfb
media: rcar-csi2: Drop comma after SoC match table sentinel
media: camss: Replace hard coded value with parameter
media: saa7134: fix incorrect use to determine if list is empty
media: MAINTAINERS: update rksip1 maintainers info
MAINTAINERS: update media vimc driver maintainers
media: i2c: max2175: Use rbtree rather than flat register cache
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 70fe728b689c..ae55cd558d95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16644,8 +16644,7 @@ F: Documentation/devicetree/bindings/sound/rockchip,i2s-tdm.yaml F: sound/soc/rockchip/rockchip_i2s_tdm.* ROCKCHIP ISP V1 DRIVER -M: Helen Koike <helen.koike@collabora.com> -M: Dafna Hirschfeld <dafna.hirschfeld@collabora.com> +M: Dafna Hirschfeld <dafna@fastmail.com> L: linux-media@vger.kernel.org L: linux-rockchip@lists.infradead.org S: Maintained @@ -20364,8 +20363,8 @@ F: drivers/media/common/videobuf2/* F: include/media/videobuf2-* VIMC VIRTUAL MEDIA CONTROLLER DRIVER -M: Helen Koike <helen.koike@collabora.com> -R: Shuah Khan <skhan@linuxfoundation.org> +M: Shuah Khan <skhan@linuxfoundation.org> +R: Kieran Bingham <kieran.bingham@ideasonboard.com> L: linux-media@vger.kernel.org S: Maintained W: https://linuxtv.org |