diff options
| author | Nathan Chancellor <natechancellor@gmail.com> | 2018-05-26 08:38:53 -0700 |
|---|---|---|
| committer | Nathan Chancellor <natechancellor@gmail.com> | 2018-05-26 08:38:53 -0700 |
| commit | eddcf87321a599f28fdccadc7fbbce85d5990b33 (patch) | |
| tree | b7aea5a619c4e6b12c77ce7b6f270a036d4ef1fb /net/lapb/lapb_subr.c | |
| parent | 25c7cad5957ce8f6313f4e753d0d5f1a7a20d555 (diff) | |
| parent | 3c93a9b8d3fe8c6f241946a4128a35112322bf99 (diff) | |
Merge remote-tracking branch 'als/android-msm-wahoo-4.4' into oreo-m2
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Conflicts:
arch/arm64/include/asm/cputype.h
arch/arm64/include/asm/futex.h
kernel/time/timekeeping.c
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions