From: Jeff Garzik <jgarzik@pobox.com>
Date: Fri, 17 Feb 2006 21:20:30 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2~56
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'upstream-fixes'
---

b04a92e1601eb6df3a3b6599e7fb7ee021eef2cb