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-Tag: v2.6.19-rc1~1262^2~67
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b85f29ca453d56d83cdffa075d615583bb8fb72;p=linux-2.6

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

5b85f29ca453d56d83cdffa075d615583bb8fb72