Merge "power: pm8921-bms: Prevent SoC from rising during discharge"
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>
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"