Merge remote-tracking branch 'origin/core120' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 28 Apr 2018 07:09:00 +0000 (09:09 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 28 Apr 2018 07:09:00 +0000 (09:09 +0200)

Trivial merge