From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jun 2017 21:51:25 +0000 (+0900)
Subject: Merge tag 'fbdev-v4.12-rc6' of git://github.com/bzolnier/linux
X-Git-Tag: v4.14-rc1~731
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3a448294b79ace48cf8ecbbffdeceae49bae00cc;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'fbdev-v4.12-rc6' of git://github.com/bzolnier/linux

Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - fix udlfb driver to stop spamming logs (Mike Gerow)

 - add missing endianness conversions in smscufx & udlfb drivers (Johan
   Hovold)

 - fix few gcc warnings/errors (Arnd Bergmann)

* tag 'fbdev-v4.12-rc6' of git://github.com/bzolnier/linux:
  video: fbdev: udlfb: drop log level for blanking
  video: fbdev: via: remove possibly unused variables
  video: fbdev: add missing USB-descriptor endianness conversions
  video: fbdev: avoid int-in-bool-context warning
---

3a448294b79ace48cf8ecbbffdeceae49bae00cc