From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 23 Aug 2006 18:22:14 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~60^2~30
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=4c2be501b7e8695f8bdf4f7d5f51595ed55eea44;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream-fixes' into upstream
---

4c2be501b7e8695f8bdf4f7d5f51595ed55eea44