Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 4 Feb 2015 10:44:11 +0000 (12:44 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Wed, 4 Feb 2015 10:44:11 +0000 (12:44 +0200)
Merge fbdev topic branches


Trivial merge