From: Arne Fitzenreiter Date: Mon, 6 Oct 2014 08:11:13 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/master' into kernel-test X-Git-Tag: v2.17-core87~103^2~32^2~2^2~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=522b5fbf3eb489ab0cb9b1b4e42920cc365764e9;p=ipfire-2.x.git Merge remote-tracking branch 'origin/master' into kernel-test --- 522b5fbf3eb489ab0cb9b1b4e42920cc365764e9