find7a: merge git://codeaurora.org/quic/la/kernel/msm kk_3.5

Conflicts:
        arch/arm/boot/dts/msm8974-camera-sensor-mtp.dtsi
        arch/arm/mach-msm/clock-8974.c
        arch/arm/mach-msm/socinfo.c
        drivers/leds/leds-qpnp.c
        drivers/power/qpnp-charger.c
        drivers/rtc/alarm-dev.c
        drivers/rtc/alarm.c
        drivers/slimbus/slim-msm.h
        drivers/video/msm/mdss/mdss_fb.c
        include/linux/power_supply.h
        include/media/msm_cam_sensor.h

Signed-off-by: houst0nn <houstonn@gmail.com>