From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 29 Sep 2014 11:45:06 +0000 (+0200)
Subject: Merge branch 'master' into kernel-test
X-Git-Tag: v2.17-core87~103^2~32^2~2^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ecc92f3c835ba632d399154072631b340c2bac5c;p=ipfire-2.x.git

Merge branch 'master' into kernel-test
---

ecc92f3c835ba632d399154072631b340c2bac5c