Merge branch 'depends/omap2_dss' into next/cleanup