From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Mon, 29 Sep 2008 20:21:52 +0000 (+0200)
Subject: Merge branch 'kernel25'
X-Git-Tag: v2.3-beta4~14^2~4
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=fe114e34880fc40cf19d2ea6b4bdefa2c24b9254

Merge branch 'kernel25'
---

fe114e34880fc40cf19d2ea6b4bdefa2c24b9254