Merge branch '3.18/omapdss-fixes' into 3.18/fbdev-fixes
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 30 Oct 2014 12:53:49 +0000 (14:53 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Thu, 30 Oct 2014 12:53:49 +0000 (14:53 +0200)

Trivial merge