From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 31 Jan 2006 16:50:25 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~65
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=359b8800d3a46557844969c485e1a14baf119b06;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'upstream-fixes'
---

359b8800d3a46557844969c485e1a14baf119b06