From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 4 Dec 2005 01:34:14 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.16-rc1~474^2~22^2~6^2~20
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4ef679e6caf1261b6380a610a705a90d7e2738c6;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes'
---

4ef679e6caf1261b6380a610a705a90d7e2738c6