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

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

4ad88740a073e13a69d61848af3a808ce1251af8