]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 10 Mar 2015 12:50:12 +0000 (14:50 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Tue, 10 Mar 2015 12:50:12 +0000 (14:50 +0200)

Trivial merge