From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 15 Dec 2015 18:50:13 +0000 (-0800)
Subject: Merge tag 'fbdev-fixes-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba... 
X-Git-Tag: v4.4-rc6~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8c2b759efa0faa09632ce63765751202b412b459;p=karo-tx-linux.git

Merge tag 'fbdev-fixes-4.4' of git://git.kernel.org/pub/scm/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
---

8c2b759efa0faa09632ce63765751202b412b459