From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 29 Mar 2015 17:33:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into kernel-test
X-Git-Tag: v2.17-core91~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a8d9f5cec1db248c75dc991d21186da554ca48ec;p=people%2Fstevee%2Fipfire-2.x.git

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

Conflicts:
	lfs/openssl-compat
---

a8d9f5cec1db248c75dc991d21186da554ca48ec