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

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

32f17a8e4ad0701b3ddbcc22b353bb5430c9d42b