Merge remote-tracking branch 'origin/core120' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Apr 2018 15:11:45 +0000 (17:11 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 2 Apr 2018 15:11:45 +0000 (17:11 +0200)

Trivial merge