From: Jeff Garzik <jgarzik@pobox.com>
Date: Tue, 13 Dec 2005 06:46:20 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.17-rc1~1182^2~130^2~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=80c7af4074cbb4cb6be5d35c443ea6d5e8838a84;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream'
---

80c7af4074cbb4cb6be5d35c443ea6d5e8838a84