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

Merge branch 'master' into upstream
---

f9bcda7760e1373615c9f6d9ce24209b0ab97de1