From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 4 Jul 2012 08:40:34 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/next' into kernel-update
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=966e5b56c48c1676c0cbdf96c5ad659af7b4df56

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

966e5b56c48c1676c0cbdf96c5ad659af7b4df56