diff options
| author | Siqi Lin <siqilin@google.com> | 2018-09-05 12:04:10 -0700 |
|---|---|---|
| committer | Siqi Lin <siqilin@google.com> | 2018-09-05 12:04:29 -0700 |
| commit | 1c048f532f8e7a7c412baa36a4e215c0223712a7 (patch) | |
| tree | a2af23dd1040d12a1633d58e305de7c45126f8f2 /net/lapb/lapb_timer.c | |
| parent | 43be8f8b6710bab5f559d9c33b90bd4a4360d543 (diff) | |
| parent | 2513d2388ed10f8dbb80088426c6e402b2e9eb6b (diff) | |
Merge branch 'android-msm-marlin-3.18-pi' into android-msm-marlin-3.18-pi-security-next
Merging before November security patches.
Bug: 112384410
Change-Id: If5ba3fe0917c11a71f0968f26fef4646e0dbbeec
Signed-off-by: Siqi Lin <siqilin@google.com>
Diffstat (limited to 'net/lapb/lapb_timer.c')
0 files changed, 0 insertions, 0 deletions