From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 29 Jul 2006 05:39:26 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5b85f29ca453d56d83cdffa075d615583bb8fb72;p=linux.git

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

5b85f29ca453d56d83cdffa075d615583bb8fb72