From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 5 May 2006 20:56:24 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~60^2~17
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd5226a72694d1c0abe1cc39711a86f1754e637d;p=linux-2.6

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

fd5226a72694d1c0abe1cc39711a86f1754e637d