From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 20 Apr 2006 21:55:24 +0000 (-0400)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.18-rc1~1115^2~90
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f5d5dbf0372dd933d8325054889ba09d996e50b;p=linux-2.6

Merge branch 'upstream-fixes'
---

1f5d5dbf0372dd933d8325054889ba09d996e50b