From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 3 Jan 2006 15:59:55 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=02f693c7118f6be9e677070eb630c1f3a654cdd3;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream'
---

02f693c7118f6be9e677070eb630c1f3a654cdd3