From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 9 Feb 2006 09:29:00 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc3~47^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9caafa6c8686e319cf4d5f3757b3972c6c522b7c;p=linux-2.6

Merge branch 'upstream-fixes'
---

9caafa6c8686e319cf4d5f3757b3972c6c522b7c