From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 16 Nov 2005 20:12:58 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.15-rc2~69^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3be4bb06b53df2c0a760eeaa5f53448faddedfca;p=linux-2.6

Merge branch 'upstream-fixes'
---

3be4bb06b53df2c0a760eeaa5f53448faddedfca