From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 May 2018 15:38:51 +0000 (-1000)
Subject: Merge tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b99dc74253980287c826b8158327fc8f2ff03dad;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'media/v4.17-4' of git://git./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
---

b99dc74253980287c826b8158327fc8f2ff03dad