From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 29 Nov 2005 08:57:16 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5e3c2b95dd560baa41b08c8f5f00bbd6fbeebdcb;p=linux.git

Merge branch 'upstream'
---

5e3c2b95dd560baa41b08c8f5f00bbd6fbeebdcb