From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 6 Mar 2006 19:38:16 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=74f5ec29ae93aa42c49f4285c20c457afe937881;p=linux.git

Merge branch 'upstream-fixes'
---

74f5ec29ae93aa42c49f4285c20c457afe937881