Update from OPPO

1 fixed some issues with chargering, and battery
2 fixed some issues with earphone
3 fixed issue with camera, optimized the effect of camera.
4 optimzed driver of screen display and touch panel

Conflicts:
	arch/arm/mach-msm/socinfo.c
	drivers/input/touchscreen/synaptics_s3202_i2c_rmi_n1.c
	drivers/input/touchscreen/touch_y8c20x66a.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/oppo/m9mo_fw.h
	drivers/media/video/msm/oppo/m9mo_v4l2.c
	drivers/nfc/pn544-oppo.c
	drivers/power/pm8921-charger.c
	drivers/power/smb358_charger.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/lm3630_bl.c
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_orise_n1.c
	drivers/video/msm/msm_fb.c
	include/linux/boot_mode.h
	kernel/power/earlysuspend.c
	kernel/power/wakelock.c
	lib/ratelimit.c
	mm/backing-dev.c
	mm/vmscan.c
	sound/soc/codecs/wcd9310-oppo.c