From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 20 Nov 2005 05:41:08 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~8
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8238e747b62db977f80bfd4e5694d4fc2c1112d5;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'upstream'
---

8238e747b62db977f80bfd4e5694d4fc2c1112d5