projects / linux-2.6-block.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99b9be7 4dcd19b)
Merge tag 'fbdev-v4.10-rc2' of git://github.com/bzolnier/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jan 2017 17:00:57 +0000 (09:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jan 2017 17:00:57 +0000 (09:00 -0800)
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


Trivial merge
Linux 6.x block layer and io_uring tree(s)