From: Jeff Garzik <jgarzik@pobox.com>
Date: Sat, 28 Jan 2006 21:06:45 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~67
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0cc349d130b34de3046fb3d0e31eaf6ff5540cad;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'upstream-fixes'
---

0cc349d130b34de3046fb3d0e31eaf6ff5540cad