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

Merge branch 'from-linus' into upstream
---

5dd8816aeb1f068ade0349a22009ff7a66f25413