diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2018-05-14 15:48:51 -0700 |
|---|---|---|
| committer | Nathan Chancellor <natechancellor@gmail.com> | 2018-05-14 15:48:51 -0700 |
| commit | 596541f93bea814c9b766e0b9235fcdd9de445fa (patch) | |
| tree | 69fb858bc7d9370c56deec9a0d25925b9754e1e7 /net/lapb/lapb_timer.c | |
| parent | 6827615cfc0704cc6d86d6937c2198f5a837f8d5 (diff) | |
| parent | 7ed15af31b32a81dfbbe3bed5dd6892384f2ea77 (diff) | |
Merge branch 'image-unification' into oreo-m2
* image-unification:
Revert "wake_gestures: Update for configuration split"
flash_defconfig: Unify again
lge_battery: Move battery check into bm_init
htc_battery: Move battery check into htc_battery_probe_process
power: htc/lge_battery: Check for valid battery type string during probe
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions
