Merge remote-tracking branch 'remotes/quic/jb_3.2' into HEAD
Conflicts:
arch/arm/configs/msm8226-perf_defconfig
arch/arm/configs/msm8226_defconfig
arch/arm/mach-msm/clock-8974.c
arch/arm/mach-msm/clock-local2.c
arch/arm/mach-msm/clock-mdss-8974.c
arch/arm/mach-msm/clock-mdss-8974.h
drivers/gpu/msm/kgsl_device.h
drivers/input/touchscreen/synaptics_i2c_rmi4.c
drivers/media/platform/msm/vidc/msm_vidc.c
drivers/media/platform/msm/vidc/venus_hfi.c
drivers/media/platform/msm/vidc/vidc_hfi_io.h
drivers/misc/qseecom.c
drivers/thermal/msm_thermal.c
drivers/video/msm/mdss/mdp3.c
drivers/video/msm/mdss/mdp3.h
drivers/video/msm/mdss/mdp3_ctrl.c
drivers/video/msm/mdss/mdss_fb.c
drivers/video/msm/mdss/mdss_mdp_overlay.c
drivers/video/msm/mdss/mdss_mdp_pp.c
sound/soc/codecs/msm_hdmi_codec_rx.c
sound/soc/codecs/wcd9306.c
sound/soc/codecs/wcd9xxx-resmgr.c
sound/soc/msm/qdsp6v2/audio_acdb.c
Change-Id: Ibc13fd9186ff593bb11e9fa61bb03b10c22a3383