From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 2 Oct 2018 12:19:43 +0000 (-0700)
Subject: Merge tag 'fbdev-v4.19-rc7' of https://github.com/bzolnier/linux
X-Git-Tag: Ubuntu-5.10.0-12.13~6939
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1d2ba7fee28b3a47cca8e8f4f94a22d30b2b3a6f;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'fbdev-v4.19-rc7' of https://github.com/bzolnier/linux

Bartlomiej writes:
  "fbdev fixes for v4.19-rc7:

   - fix OMAPFB_MEMORY_READ ioctl to not leak kernel memory in omapfb driver
     (Tomi Valkeinen)

   - add missing prepare/unprepare clock operations in pxa168fb driver
     (Lubomir Rintel)

   - add nobgrt option in efifb driver to disable ACPI BGRT logo restore
     (Hans de Goede)

   - fix spelling mistake in fall-through annotation in stifb driver
     (Gustavo A. R. Silva)

   - fix URL for uvesafb repository in the documentation (Adam Jackson)"

* tag 'fbdev-v4.19-rc7' of https://github.com/bzolnier/linux:
  video/fbdev/stifb: Fix spelling mistake in fall-through annotation
  uvesafb: Fix URLs in the documentation
  efifb: BGRT: Add nobgrt option
  fbdev/omapfb: fix omapfb_memory_read infoleak
  pxa168fb: prepare the clock
---

1d2ba7fee28b3a47cca8e8f4f94a22d30b2b3a6f