From: Jeff Garzik <jeff@garzik.org>
Date: Sun, 12 Mar 2006 00:10:06 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1182^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=75deb6fa985bd3162b9472f1fc394e23294da816;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes'
---

75deb6fa985bd3162b9472f1fc394e23294da816