From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 20 Jul 2018 12:47:20 +0000 (+0000)
Subject: Merge branch 'next' into efi
X-Git-Tag: v2.21-core124~77^2~7
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=a570226765f6774c3eece1006b462d20d0b991f9

Merge branch 'next' into efi
---

a570226765f6774c3eece1006b462d20d0b991f9