From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Oct 2021 16:53:40 +0000 (-0700)
Subject: Merge tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=84b3e42564accd94c2680e3ba42717c32c8b5fc4;p=linux.git

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

Pull media fix from Mauro Carvalho Chehab:
 "There's just one patch here, fixing a -Werror issue at
  staging/atomisp"

* tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: atomisp: restore missing 'return' statement
---

84b3e42564accd94c2680e3ba42717c32c8b5fc4