diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2018-06-19 23:12:57 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2018-06-19 23:12:57 +0300 |
| commit | de6dac6df6807f901bac8e29de24a6a7981aea2d (patch) | |
| tree | a70d6303c33a857e730b5d920bfe7dc1047999dc /net/lapb/lapb_in.c | |
| parent | ed9b46f6268d2abcbb9079bf44261e3b6e8c424f (diff) | |
| parent | 44ff472b917252c55c8e96ce7e0612aed13269cb (diff) | |
Merge tag 'LA.UM.6.6.r1-08900-89xx.0' of kernel/msm-3.18 into lineage-15.1-caf-8996
Conflicts:
net/sctp/socket.c
Change-Id: I90c45f914ac4d11bbeee3722ede5ea55e52898e1
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions