From: Jeff Garzik <jgarzik@pobox.com>
Date: Wed, 16 Nov 2005 16:07:14 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8bb6030b62a70edc0cb8129338f83e9063aeaf92;p=linux.git

Merge branch 'upstream-fixes'
---

8bb6030b62a70edc0cb8129338f83e9063aeaf92