Merge tag 'fbdev-v4.12-rc6' of git://github.com/bzolnier/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 21:51:25 +0000 (06:51 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 21:51:25 +0000 (06:51 +0900)
commit3a448294b79ace48cf8ecbbffdeceae49bae00cc
treedf9d5f6d4503d3de81335e51719f78dba3cda9f7
parent162f73f4b974aa08ab37e9d59f0428edfa8dbc51
parentb429f96aa5cb4023b915de9c2aa6e7720a939856
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