staging: prima: Merge LNX.LA.3.5.1.1-07000-8x74.0

* Fixes Wi-Fi tethering

BUG: CYAN-4312
Change-Id: I9c987b2a8091ed658b155d22b6cbf548c4f642af
staging: prima: Actually update to CAF LNX.LA.3.5.1.1-07000-8x74.0

The last update was a 'git merge' on the prima repository, which
didn't reflect all the changes between the old and the above tag
for some reason.
Fix this by checking out the above tag while
preserving local modifitions.

This resolves the wifi tethering issue for everyone.
Bug: CYAN-4312

Change-Id: Iedd36005b01f6df8eff44af32fbf58b18169b2ae
leds-qpnp: Blink interpolation, qpnp-pwm driver fix

Change-Id: I715dbc00b0b8e49d0b94a687081b9620e3a09cc2
Merge tag 'LNX.LA.3.5.1-01110-8x74.0' of /home/cdesai/android/mirror/caf/kernel/msm

"LNX.LA.3.5.1-01110-8x74.0"

Conflicts:
	Documentation/devicetree/bindings/fb/mdss-mdp.txt
	arch/arm/boot/dts/msm8974-v2.2.dtsi
	arch/arm/mach-msm/lpm_levels.c
	arch/arm/mach-msm/msm-pm.c
	drivers/cpufreq/cpu-boost.c
	drivers/gpu/ion/ion_system_heap.c
	drivers/gpu/msm/kgsl_iommu.c
	drivers/media/platform/msm/camera_v2/msm.c
	drivers/media/platform/msm/wfd/mdp-5-subdev.c
	drivers/power/qpnp-charger.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_fb.h
	drivers/video/msm/mdss/mdss_hdmi_edid.c
	drivers/video/msm/mdss/mdss_mdp_wb.c
	drivers/video/msm/mdss/mhl_sii8334.c
	include/linux/mhl_8334.h
	include/linux/msm_mdp.h
	net/ipv6/ping.c
	sound/soc/msm/msm8974.c

Change-Id: Ie096778c6a3c8b1a99ab30a65a0223b3eecfbc35