commit b99dc74253980287c826b8158327fc8f2ff03dad
author Linus Torvalds <torvalds@linux-foundation.org> Fri May 04 05:38:51 2018 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> Fri May 04 05:38:51 2018 -1000
tree 05271a97e9e64987555009cd7486a6813b798446
parent dac1acc3c216b09e04f173b3c1b94f1760ab3078
parent 3259081991a9398434f6f49468b960f136ac0158

Merge tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:

 - a trivial one-line fix addressing a PTR_ERR() getting value from a
   wrong var at imx driver

 - a patch changing my e-mail at the Kernel tree to mchehab@kernel.org.
   no code changes

* tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  MAINTAINERS & files: Canonize the e-mails I use at files
  media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR