From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 7 Jul 2012 21:17:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into kernel-update
X-Git-Tag: v2.13-beta1~256^2~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08b4415ef2efe8a22a39f5e836099269fa024738;p=ipfire-2.x.git

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

08b4415ef2efe8a22a39f5e836099269fa024738