From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 20 Jul 2014 19:06:11 +0000 (+0200)
Subject: Merge branch 'master' into kernel-test
X-Git-Tag: v2.17-core87~103^2~32^2~2^2~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ccb96d4fc5065cdf85fef7344ef1f9cf624fd309;p=ipfire-2.x.git

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

ccb96d4fc5065cdf85fef7344ef1f9cf624fd309