From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 9 Feb 2006 05:59:34 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=725b2805fd5d729b0db59fe8fc992e97523782c7;p=linux.git

Merge branch 'upstream-fixes'
---

725b2805fd5d729b0db59fe8fc992e97523782c7