From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 04:51:01 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~6^2~10
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=575ab52a218e4ff0667a6cbd972c3af443ee8713;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'upstream-fixes'
---

575ab52a218e4ff0667a6cbd972c3af443ee8713