From: John W. Linville <linville@tuxdriver.com>
Date: Thu, 27 Jul 2006 19:06:13 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.19-rc1~1263^2~117^2~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=416512cb75f51f3d12e5e1aa57b6a36760fd12c9;p=linux-2.6-omap-h63xx.git

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

416512cb75f51f3d12e5e1aa57b6a36760fd12c9