From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 22 May 2006 18:45:29 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~60^2~1
X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=01d654d25d23fb73deb7904ce1c0b3a0f5fc2908;p=linux-2.6-omap-h63xx.git

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

01d654d25d23fb73deb7904ce1c0b3a0f5fc2908