From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 14 Dec 2005 03:22:41 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5;p=linux.git

Merge branch 'upstream'
---

e7fb585940a3dc87a42ebc30a62296e5cf6f9cd5