From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 19 Sep 2006 04:42:13 +0000 (-0400)
Subject: Merge branch 'master' into upstream
X-Git-Tag: v2.6.19-rc1~1262^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a3381feb823e06c8e2da7e283c17b0b6fdbddcf;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'master' into upstream
---

4a3381feb823e06c8e2da7e283c17b0b6fdbddcf