From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 28 Apr 2018 07:09:00 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/core120' into kernel-4.14
X-Git-Tag: v2.21-core122~178^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79dbff45cb15e490713f5afd7900dd480d74a131;p=people%2Fstevee%2Fipfire-2.x.git

Merge remote-tracking branch 'origin/core120' into kernel-4.14
---

79dbff45cb15e490713f5afd7900dd480d74a131