From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 11 Aug 2017 18:44:18 +0000 (-0700)
Subject: Merge tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux
X-Git-Tag: v4.13-rc5~13
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7eb97ba611f5904abb3e0653b005904d9144c81a;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux

Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - allow user to disable write combined mapping in efifb driver (Dave
   Airlie)

 - fix use after free bugs on driver removal in imxfb driver (Dan
   Carpenter)

 - fix unused variable warning in omapfb driver (Arnd Bergmann)

* tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux:
  efifb: allow user to disable write combined mapping.
  fbdev: omapfb: remove unused variable
  video: fbdev: imxfb: use after free in imxfb_remove()
---

7eb97ba611f5904abb3e0653b005904d9144c81a