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

Merge branch 'upstream-fixes'
---

c902f981b79b512eb3d0c0410f8cae88c78beb57