Merge U8686 release (05/08/2013)

Conflicts:
	arch/arm/mach-msm/board-msm7x27a.c
	arch/arm/mach-msm/hardware_self_adapt.c
	drivers/i2c/huawei_i2c_debug.c
	drivers/input/misc/aps-9900.c
	drivers/input/touchscreen/melfas_i2c_ts.c
	drivers/media/video/msm/tps61310.c
	drivers/video/msm/lcd_hw_debug.h
	drivers/video/msm/mipi_hx8369b_video_wvga.c
	drivers/video/msm/mipi_nt35510_cmd_wvga.c
	fs/proc/app_info.c
	include/linux/hardware_self_adapt.h