Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 20 Jan 2014 08:57:01 +0000 (10:57 +0200)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Mon, 20 Jan 2014 08:57:01 +0000 (10:57 +0200)
commitcb1fbad7ec250ac408a4682d38b205958a17a02b
treee19ac5e90ada26b71646234131e39c86ec437bff
parent073bf172619612bd4bfaa0f59e694b5d1b2f4c49
parente4998634dd3874e24bbf7937305c5ac708243908
parentfc1fe6e794cc85fcdb63daa9c7a977940ff49e4f
Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next

Merge fbdev topic branches
drivers/video/omap2/dss/dpi.c
drivers/video/omap2/dss/dss.h
drivers/video/omap2/dss/sdi.c