From: Jeff Garzik <jeff@garzik.org>
Date: Wed, 12 Apr 2006 20:54:16 +0000 (-0400)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~97^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=875999c5539999f61a45620aae0c3e5fb1d2b035;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'upstream'
---

875999c5539999f61a45620aae0c3e5fb1d2b035