From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 29 Nov 2005 08:57:16 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5e3c2b95dd560baa41b08c8f5f00bbd6fbeebdcb;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream'
---

5e3c2b95dd560baa41b08c8f5f00bbd6fbeebdcb