From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 16:36:18 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~7^2~18
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d22a8ccff761c81f2930bd90fa5712e51a0e9a62;p=linux-2.6

Merge branch 'upstream-fixes'
---

d22a8ccff761c81f2930bd90fa5712e51a0e9a62