From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Sep 2021 20:05:12 +0000 (-0700)
Subject: Merge tag 'media/v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e6609f2c07de03b948fd6c37c5eb4ade3a6d785c;p=linux.git

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

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

   - hantro: Fix check for single irq

   - cedrus: Fix SUNXI tile size calculation

   - s5p-jpeg: rename JPEG marker constants to prevent build warnings

   - ir_toy: prevent device from hanging during transmit"

* tag 'media/v5.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: ir_toy: prevent device from hanging during transmit
  media: s5p-jpeg: rename JPEG marker constants to prevent build warnings
  media: cedrus: Fix SUNXI tile size calculation
  media: hantro: Fix check for single irq
---

e6609f2c07de03b948fd6c37c5eb4ade3a6d785c