From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Jan 2017 17:00:57 +0000 (-0800)
Subject: Merge tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux
X-Git-Tag: android-x86-8.1-r1~4386
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f7445197a263c99ddb898f3609fed21673ae24c;p=android-x86%2Fkernel.git

Merge tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux

Pull fbdev fixes from Bartlomiej Zolnierkiewicz:

 - bring fbdev subsystem back into Maintained mode

 - add missing devm_ioremap() error checking to cobalt_lcdfb driver

* tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux:
  video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap
  MAINTAINERS: add myself as maintainer of fbdev
---

9f7445197a263c99ddb898f3609fed21673ae24c