summaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2014-01-20 10:57:01 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2014-01-20 10:57:01 +0200
commitcb1fbad7ec250ac408a4682d38b205958a17a02b (patch)
treee19ac5e90ada26b71646234131e39c86ec437bff /drivers/video
parent073bf172619612bd4bfaa0f59e694b5d1b2f4c49 (diff)
parente4998634dd3874e24bbf7937305c5ac708243908 (diff)
parentfc1fe6e794cc85fcdb63daa9c7a977940ff49e4f (diff)
downloadlinux-cb1fbad7ec250ac408a4682d38b205958a17a02b.tar.bz2
Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next
Merge fbdev topic branches