From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Sep 2014 16:11:37 +0000 (-0700)
Subject: Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba... 
X-Git-Tag: MMI-PSA29.97-13-9~11556
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5874cfed0b04f53146f70a519a2371cea5f39178;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'fbdev-fixes-3.17' of git://git./linux/kernel/git/tomba/linux

Pull fbdev fixes from Tomi Valkeinen:
 "Minor fixes for amba-clcd and video DT bindings"

* tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  video: ARM CLCD: Fix color model capabilities for DT platforms
  video: fix composite video connector compatible string
---

5874cfed0b04f53146f70a519a2371cea5f39178