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

Merge remote-tracking branch 'origin/master' into kernel-test
---

a767496442939a5e5cec1a44114f2f747ef07a07