revert "revert some changes (temporary) for make a bootable kernel with linaro 4.7 and -O2 optimization"

Conflicts:

	arch/arm/mach-msm/display/board-ville-panel.c
	drivers/char/msm_rotator.c
	drivers/gpu/msm/adreno.c
	drivers/staging/prima/CORE/HDD/src/wlan_hdd_ftm.c
	drivers/staging/prima/CORE/SME/src/csr/csrApiRoam.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/mdp4_overlay_writeback.c
	drivers/video/msm/mdp4_util.c
	drivers/video/msm/mdp_dma_lcdc.c
	drivers/video/msm/msm_fb.c
	include/linux/msm_vidc_dec.h
	kernel/trace/ftrace.c
	sound/soc/msm/msm-pcm-afe.c