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

Merge branch 'upstream-fixes'
---

97bae8dc961f59e81e85c7f92ff04f5ff73c20e8