• Tomi Valkeinen's avatar
    Merge commit 'v3.3-rc6' · 0ba86d7e
    Tomi Valkeinen authored
    Merge v3.3-rc6 to get the latest DSS and OMAP arch fixes.
    
    Conflicts:
    	arch/arm/mach-omap1/board-innovator.c
    	drivers/video/omap2/dss/apply.c
    0ba86d7e
io.c 11.5 KB