cp3dug-3.4.0-gf698891
resync config
fix build for new gcc, restore comments from c20c0257e425570289c833ea196c0fd78764fbd8
restore from 54b40885cb1429b38f15185b3f0a84e785f1047f
Merge commit '54b40885cb1429b38f15185b3f0a84e785f1047f' into cp3dug

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/Makefile.boot
	arch/arm/mach-msm/audio-7627a-devices.c
	arch/arm/mach-msm/board-msm7627a-wlan.c
	arch/arm/mach-msm/board-msm7x27a-regulator.c
	arch/arm/mach-msm/clock-pcom-lookup.c
	arch/arm/mach-msm/clock-pll.c
	arch/arm/mach-msm/clock-pll.h
	arch/arm/mach-msm/devices-msm7x27a.c
	arch/arm/mach-msm/devices_htc.c
	arch/arm/mach-msm/display/Makefile
	arch/arm/mach-msm/htc_acoustic.c
	arch/arm/mach-msm/htc_battery.c
	arch/arm/mach-msm/include/mach/board_htc.h
	arch/arm/mach-msm/include/mach/htc_acoustic.h
	arch/arm/mach-msm/include/mach/htc_battery.h
	arch/arm/mach-msm/include/mach/htc_headset_mgr.h
	arch/arm/mach-msm/include/mach/msm_iomap-7xxx.h
	arch/arm/mach-msm/include/mach/msm_serial_hs.h
	arch/arm/mach-msm/proc_comm.c
	arch/arm/tools/mach-types
	drivers/media/video/msm/actuators/s5k3h2yx_act.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/rawchip/rawchip.c
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/s5k3h2yx_v4l2.c
	drivers/power/max17050_battery.c
	drivers/spi/spi_cpld.c
	drivers/tty/serial/msm_serial_hs.c
	kernel/sys.c
Merge branch 'cp3dug' into jelly_3.4

Conflicts:
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/board-msm7627a-wlan.c
	arch/arm/mach-msm/board-msm7x27a-regulator.c
	arch/arm/mach-msm/clock-pcom-lookup.c
	arch/arm/mach-msm/clock-pll.c
	arch/arm/mach-msm/clock-pll.h
	arch/arm/mach-msm/devices-msm7x27a.c
	arch/arm/mach-msm/devices_htc.c
	arch/arm/mach-msm/display/Makefile
	arch/arm/mach-msm/htc_acoustic.c
	arch/arm/mach-msm/htc_battery.c
	arch/arm/mach-msm/include/mach/board_htc.h
	arch/arm/mach-msm/include/mach/htc_battery.h
	arch/arm/mach-msm/include/mach/msm_iomap-7xxx.h
	arch/arm/mach-msm/proc_comm.c
	arch/arm/tools/mach-types
	drivers/media/video/msm/actuators/s5k3h2yx_act.c
	drivers/media/video/msm/rawchip/rawchip.c
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/s5k3h2yx_v4l2.c
	drivers/power/max17050_battery.c
	drivers/spi/spi_cpld.c
	drivers/tty/serial/msm_serial_hs.c
	kernel/sys.c