From: Jeff Garzik <jeff@garzik.org>
Date: Fri, 24 Feb 2006 02:16:27 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~54
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b0386921db20add25afd8678ed34a9253e512fc;p=linux-2.6

Merge branch 'upstream-fixes'
---

7b0386921db20add25afd8678ed34a9253e512fc