Merge tag 'media/v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Oct 2021 16:53:40 +0000 (09:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Oct 2021 16:53:40 +0000 (09:53 -0700)
commit84b3e42564accd94c2680e3ba42717c32c8b5fc4
tree9bde4509e8164a70b46706f9a51fe38564424362
parentb60be028fc1a07a88a391aa4ff3304d9dcb3d66e
parent206704a1fe0bcaaa036d3e90358bb168fac8bea1
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