From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Sep 2020 16:05:04 +0000 (-0700)
Subject: Merge tag 'media/v5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v5.9-rc7~25
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0

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()
---

8fa5960f575995bc8f3beb6b36c5aa6c61e7cdc0