Merge branch 'LA.BR.1.2.9_rb1.16' of...
Merge branch 'LA.BR.1.2.9_rb1.16' of https://source.codeaurora.org/quic/la/kernel/msm-3.10 into cm-14.1 Conflicts: drivers/devfreq/governor_msm_adreno_tz.c drivers/gpu/msm/kgsl.c drivers/gpu/msm/kgsl_mmu.c drivers/gpu/msm/kgsl_sharedmem.c drivers/gpu/msm/kgsl_sync.c drivers/input/misc/Kconfig drivers/input/misc/Makefile drivers/media/platform/msm/camera_v2/isp/msm_buf_mgr.c drivers/media/platform/msm/camera_v2/isp/msm_isp_axi_util.c drivers/media/platform/msm/camera_v2/isp/msm_isp_stats_util.c drivers/media/platform/msm/camera_v2/isp/msm_isp_util.c drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_dev.c drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c drivers/media/platform/msm/camera_v2/sensor/actuator/msm_actuator.c drivers/media/platform/msm/camera_v2/sensor/cci/msm_cci.c drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_cci_i2c.c drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c drivers/misc/qseecom.c drivers/platform/msm/ipa/ipa.c drivers/power/power_supply_sysfs.c drivers/soc/qcom/peripheral-loader.c drivers/soc/qcom/qdsp6v2/voice_svc.c drivers/staging/android/oneshot_sync.c drivers/thermal/msm_thermal-dev.c drivers/usb/phy/phy-msm-usb.c drivers/video/msm/mdss/mdss_dsi_host.c drivers/video/msm/mdss/mdss_fb.c drivers/video/msm/mdss/mdss_mdp_pp.c include/linux/power_supply.h include/media/msm_cam_sensor.h sound/core/timer.c sound/soc/codecs/wcd-mbhc-v2.c sound/soc/msm/msm-dai-fe.c sound/soc/msm/msm8x16.c sound/soc/msm/qdsp6v2/msm-compr-q6-v2.c sound/soc/msm/qdsp6v2/msm-ds2-dap-config.c sound/soc/msm/qdsp6v2/msm-lsm-client.c sound/soc/msm/qdsp6v2/msm-pcm-routing-v2.c sound/soc/msm/qdsp6v2/q6adm.c sound/soc/msm/qdsp6v2/q6voice.h
Loading
Please register or sign in to comment