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

Merge branch 'upstream-fixes'
---

c902f981b79b512eb3d0c0410f8cae88c78beb57