From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 29 Jan 2006 07:47:18 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1182^2~104
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b1d917739acd44e14eb13813e4c94dc4b6831ca3;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes'
---

b1d917739acd44e14eb13813e4c94dc4b6831ca3