From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 12 Mar 2006 00:55:37 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2f7ccc51db9f10ed2eaa4cd1777181972a23754e;p=linux.git

Merge branch 'upstream-fixes'
---

2f7ccc51db9f10ed2eaa4cd1777181972a23754e