Merge tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Aug 2017 18:44:18 +0000 (11:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Aug 2017 18:44:18 +0000 (11:44 -0700)
commit7eb97ba611f5904abb3e0653b005904d9144c81a
tree2daa1275e9ee7298a88d53e0913fb363e61b9551
parent2bfc37cdef08844c77f801a1beaa1f4efd3215df
parentdd0c41f8a7e0babdadc61d5201ac8505a79dec05
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()