Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into...
Jean-Christophe PLAGNIOL-VILLARD [Wed, 29 May 2013 09:00:34 +0000 (17:00 +0800)]
Pull Tomi fixes for ps3fb and omap2

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

1  2 
drivers/gpu/drm/omapdrm/omap_drv.c
drivers/media/platform/omap/omap_vout.c
drivers/video/omap2/dss/core.c
drivers/video/omap2/omapfb/omapfb-main.c
include/video/omapdss.h

Simple merge
Simple merge
Simple merge