From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 7 Feb 2006 07:06:12 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~59
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23a56e2cbec2860ef02d6720508fbcb07accc8b4;p=linux-2.6

Merge branch 'upstream-fixes'
---

23a56e2cbec2860ef02d6720508fbcb07accc8b4