From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 9 Feb 2006 09:30:18 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1182^2~91
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=389984cb75a5d26aa6ee9724c343bbd130cb3eec;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes'
---

389984cb75a5d26aa6ee9724c343bbd130cb3eec