From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 27 Jan 2006 03:19:57 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~79
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=97309d1a0bbdcb0813ea08574b4473d8e5416012;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'upstream-fixes'
---

97309d1a0bbdcb0813ea08574b4473d8e5416012