diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-24 18:05:04 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-24 18:05:04 +0200 |
| commit | 8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0 (patch) | |
| tree | 3121d352dc24b844193b4a5786c80684c0cf2bfd /MAINTAINERS | |
| parent | Merge tag 'sound-5.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/ti... (diff) | |
| parent | media: dt-bindings: media: imx274: Convert to json-schema (diff) | |
| download | linux-8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0.tar.xz linux-8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0.zip | |
Merge tag 'media/v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab:
- fix a regression at the CEC adapter core
- two uAPI patches (one revert) for changes in this development cycle
* tag 'media/v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
media: dt-bindings: media: imx274: Convert to json-schema
media: media/v4l2: remove V4L2_FLAG_MEMORY_NON_CONSISTENT flag
media: cec-adap.c: don't use flush_scheduled_work()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9350506a1127..190c7fa2ea01 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16154,7 +16154,7 @@ M: Leon Luo <leonl@leopardimaging.com> L: linux-media@vger.kernel.org S: Maintained T: git git://linuxtv.org/media_tree.git -F: Documentation/devicetree/bindings/media/i2c/imx274.txt +F: Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml F: drivers/media/i2c/imx274.c SONY IMX290 SENSOR DRIVER |