Merge branch 'fbdev-3.10-fixes' of git://gitorious.org/linux-omap-dss2/linux into...

Pull Tomi fixes for ps3fb and omap2

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

diff --cc drivers/gpu/drm/omapdrm/omap_drv.c
Simple merge

diff --cc drivers/media/platform/omap/omap_vout.c
Simple merge

diff --cc drivers/video/omap2/dss/core.c
Simple merge

diff --cc drivers/video/omap2/omapfb/omapfb-main.c
Simple merge

diff --cc include/video/omapdss.h
Simple merge