From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 13 Aug 2012 12:14:00 +0000 (+0200)
Subject: Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update
X-Git-Tag: v2.13-beta1~256^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8bec7790904905339ec70cb41ec3b56ce31b3349;p=ipfire-2.x.git

Merge branch 'kernel-update' of git.ipfire.org:/pub/git/ipfire-2.x into kernel-update
---

8bec7790904905339ec70cb41ec3b56ce31b3349