| commit | 8796d29812d7e36cea329127dfa1bc1a4a1d38fd | [log] [tgz] |
|---|---|---|
| author | ali_lin <Ali_Lin@compal.com> | Fri Sep 14 10:00:28 2018 +0800 |
| committer | ali_lin <Ali_Lin@compal.com> | Fri Sep 14 10:04:16 2018 +0800 |
| tree | 22eea69a6d4c7983581d93d8a4692e759a57dba6 | |
| parent | 06d7ae9f964b45f7bf730a7f3b8389b4077c5614 [diff] | |
| parent | fa2abe949235ffe6d3a597de63264948e5257557 [diff] |
Merge tag 'LW.BR.3.0.1-14500-8x09w.0-1' into android-msm-triton-3.18 Conflicts: Documentation/devicetree/bindings/power/qpnp-fg-gen3.txt drivers/power/fg-core.h drivers/power/qpnp-fg-gen3.c drivers/soc/qcom/bg_rsb.c Change-Id: Ib5f45bd26848912f186fea5b5cd1931fe69e43cd