Merge remote-tracking branch 'omap_dss2/for-next'