From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Mar 2021 18:39:18 +0000 (-0800)
Subject: Merge tag 'media/v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: microblaze-v5.14~426
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=28806e4d9b97865b450d72156e9ad229f2067f0b;p=linux-2.6-microblaze.git

Merge tag 'media/v5.12-2' of git://git./linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:
 "A couple of fixes:

   - fix a build issue with CEC

   - fix a deadlock at usbtv driver

   - fix some null pointer address issues at vsp1 driver

   - fix a wrong bitmap setting at rkisp1 driver"

* tag 'media/v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: rkisp1: params: fix wrong bits settings
  media: v4l: vsp1: Fix uif null pointer access
  media: v4l: vsp1: Fix bru null pointer access
  media: usbtv: Fix deadlock on suspend
  media: rc: compile rc-cec.c into rc-core
---

28806e4d9b97865b450d72156e9ad229f2067f0b