Merge "power: pm8921-bms: restrict soc decrease to one percent"
Merge "power: pm8921-bms: introduce configurable corrections"
Merge "power: pm8921-bms: update correction algorithm"
Merge "power: pm8921-bms: api for battery insertion/removal"
Merge "power: pm8921-charger: tune IR compensation algorithm"
Merge "power: pm8xxx-ccadc: implement quick calibration"
Merge "USB: diag_bridge: Fix a possible freed memory access"
Merge "gpu: ion: Minimize allocation fallback delay"
Merge "msm_fb: display: fix dsi pll setting to reduce phase lock time"
Merge "msm: kgsl: pwrscale functions should be run while GPU is ACTIVE"
Merge "msm: display: vsync usage in turning off dsi video"
defconfig: msm8960: Panic on recoverable icache errors

Enable panic on recoverable L1 errors to preserve ERP
driver behavior that was in place before a separate option
for icache errors was added.

Change-Id: I66c7121c6100a71534c5383c54885c28e4e68569
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
msm_fb: display: fix the hang issue caused by solidfill pipe

When mdp pipe solidfill mode is disabled, the staled pipe info is used
to update mdp pipe regs. This caused mdp hang. Since
mdp4_overlay_rgb_setup function already resets solidfill mode, this
patch removes any pipe register updates that are related to disabling
solidfill mode.

CRs-fixed: 467555
Change-Id: I23f4b29731c9097ab0cc38baa00cd35bc536d2ba
Signed-off-by: Huaibin Yang <huaibiny@codeaurora.org>
Merge "msm: camera: Fix for properly configuring AXI bus when using dual_enabled mode"
Merge "msm: display: provide mdp bandwidth parameters from board file"
Merge "msm_fb: display: get mdp bandwidth parameters from board file"
Merge "mmc: sdio: print correct UHS mode during card detection"
Merge "mmc: sdio: fix sdio_reset_comm() to take care of UHS card reset"
Merge "mmc: msm_sdcc: data timeout errors are expected during HS200 tuning"
Merge "mmc: msm_sdcc: perform DLL retuning if clock rate is changed"