diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2018-06-19 23:26:24 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2018-06-19 23:27:37 +0300 |
| commit | aa8f5541905f32d846c86974950d5bcc57d1ce8d (patch) | |
| tree | 3cfcecc74a2d66607a25d46a1360193912e358df /net/lapb/lapb_in.c | |
| parent | d7dcb73d3017cb10f5ee07a5bbf6b070891471fd (diff) | |
| parent | d4dfd3570598d6b0f269c8165d274ea1a43c1739 (diff) | |
Merge branch 'android-3.18' of https://android.googlesource.com/kernel/common into lineage-15.1-caf-8996
This brings LA.UM.6.6.r1-08900-89xx.0 up to date with android-3.18
at commit d4dfd3570598d6b0f269c8165d274ea1a43c1739.
Conflicts:
drivers/of/Kconfig
drivers/of/Makefile
drivers/of/overlay.c
drivers/of/unittest.c
Change-Id: Ic2c49b401d6899405b9f0bb231c697f647ebe02d
Diffstat (limited to 'net/lapb/lapb_in.c')
0 files changed, 0 insertions, 0 deletions