dt2w and s2w

Conflicts:
	arch/arm/boot/zImage-dtb
	drivers/video/msm/mdss/mdss_dsi_panel.c