Merge branch '3.15/dss-dt-dts' into 3.15/fbdev