From: Jeff Garzik <jeff@garzik.org>
Date: Tue, 12 Sep 2006 16:03:54 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=435b70e65d7cecbcf2a7e9495ded9d179d63f3ba;p=linux.git

Merge branch 'upstream-fixes' into upstream
---

435b70e65d7cecbcf2a7e9495ded9d179d63f3ba