Merge tag 'fbdev-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2015 18:50:13 +0000 (10:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Dec 2015 18:50:13 +0000 (10:50 -0800)
commit8c2b759efa0faa09632ce63765751202b412b459
tree90649bb14fdde96562b7633ecda8d533484f9231
parent5fab517d33bbfe01f782c5ca9999e6626686d020
parenta54c1ddbe3bc07eadb0096c4abe6224e7f363b66
Merge tag 'fbdev-fixes-4.4' of git://git./linux/kernel/git/tomba/linux

Pull two fbdev fixes from Tomi Valkeinen:
 - OMAP: fix analog tv-out when using omapdrm
 - fsl: Fix kernel crash when diu_ops is not implemented

* tag 'fbdev-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  OMAPDSS: fix timings for VENC to match what omapdrm expects
  video: fbdev: fsl: Fix kernel crash when diu_ops is not implemented