Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Sep 2014 16:11:37 +0000 (09:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 12 Sep 2014 16:11:37 +0000 (09:11 -0700)
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


Trivial merge