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

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

cd4aceeb1299799502ade8c4071136431e49b3da