summaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-12-08 09:16:31 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-12-08 09:16:31 +0200
commit3315764efceaccfb02c7d4c99ef8eed6716cd861 (patch)
tree57f7defc6641f01f119992e226b5ab79a0190627 /drivers/video
parent34685627288baa370a6102ce58d47266d24050fd (diff)
parentf3b7d0efc6b401c4e06cac45b085ddd56ba28208 (diff)
parentb14c99299b9e11615f512ddadd6ca98dc41f2cb8 (diff)
Merge branches '3.19/omapdss' and '3.19/simplefb' into fbdev
Merge fbdev topic branches.