From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 12 Apr 2006 22:11:33 +0000 (-0400)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.18-rc1~1115^2~104
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=201e06279823c73242de987f192f43d2b30e5331;p=linux-2.6

Merge branch 'upstream-fixes'
---

201e06279823c73242de987f192f43d2b30e5331