From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 18 Jan 2006 21:20:16 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~80
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4ea75b649417606fd6b38710a2962ec9770e772;p=linux-2.6

Merge branch 'upstream-fixes'
---

b4ea75b649417606fd6b38710a2962ec9770e772