Merge remote-tracking branch 'origin/next' into kernel-4.14
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Dec 2017 19:51:23 +0000 (20:51 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Dec 2017 19:51:23 +0000 (20:51 +0100)

Trivial merge