From: Nathan Scott <nathans@bruce>
Date: Wed, 22 Mar 2006 04:31:14 +0000 (+1100)
Subject: Merge HEAD from ../linux-2.6
X-Git-Tag: v2.6.17-rc1~1000^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d74f423c722b8cadfabe087369200013b217b67;p=thirdparty%2Fkernel%2Flinux.git

Merge HEAD from ../linux-2.6
---

4d74f423c722b8cadfabe087369200013b217b67