From: Jeff Garzik <jeff@garzik.org>
Date: Mon, 6 Mar 2006 19:38:16 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74f5ec29ae93aa42c49f4285c20c457afe937881;p=linux-2.6

Merge branch 'upstream-fixes'
---

74f5ec29ae93aa42c49f4285c20c457afe937881