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)
commit5874cfed0b04f53146f70a519a2371cea5f39178
treed99173f58d0d95e0cc19bb53f6c298a03d9180d9
parent850ebc0c0c50e24126461eec3ca4d07308560058
parente4cf39ea473329dfc07de1246f97d27b7fc96f79
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