From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 15 Nov 2005 19:25:12 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=68bdbdf0b32566e1ebd41415bde9a7c43b47bf48;p=linux.git

Merge branch 'upstream-fixes'
---

68bdbdf0b32566e1ebd41415bde9a7c43b47bf48