From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 17 Nov 2005 16:16:39 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~6^2~29
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=67cb6e842e7f1e534a5e0e8708a8779e33b60520;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes'
---

67cb6e842e7f1e534a5e0e8708a8779e33b60520