From: Jeff Garzik <jeff@garzik.org>
Date: Sat, 20 May 2006 04:26:26 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~77
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e3ceac609cce39cb96e0eb8604934592371ed8c;p=linux-2.6

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

4e3ceac609cce39cb96e0eb8604934592371ed8c