From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 07:30:04 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e508a391a0705f770ef1c4f1c304678b0e8e4fe8;p=linux.git

Merge branch 'upstream-fixes'
---

e508a391a0705f770ef1c4f1c304678b0e8e4fe8