diff options
| author | Andrew Lehmer <alehmer@google.com> | 2018-10-22 12:42:13 -0700 |
|---|---|---|
| committer | Andrew Lehmer <alehmer@google.com> | 2018-10-22 12:42:13 -0700 |
| commit | 37c0f754f4a969a6ec9ad921203224fc1bbf17b2 (patch) | |
| tree | f4acb592cb0895ba70127263fcc3203872e1811f /net/lapb/lapb_timer.c | |
| parent | 60e9f50edfe667fa017b2b7fe4f085bbb904eba7 (diff) | |
| parent | ae2f29938c9e438d1dacd8b4e5e19696a9fc76d0 (diff) | |
Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-security-next
Merging before January security patches.
Bug: 118159841
Change-Id: I1003c974c2db275ece6d4610de9ffb48aec4760a
Signed-off-by: Andrew Lehmer <alehmer@google.com>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions