From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 3 Jan 2006 15:59:55 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=02f693c7118f6be9e677070eb630c1f3a654cdd3;p=linux.git

Merge branch 'upstream'
---

02f693c7118f6be9e677070eb630c1f3a654cdd3