From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 7 Jul 2012 21:16:47 +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~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44fd6d2bb50f728b1ea772b9c184cfcca872b568;p=people%2Fms%2Fipfire-2.x.git

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

44fd6d2bb50f728b1ea772b9c184cfcca872b568