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

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

3b38f317e529d8396377dafc7d95a1451a151df5