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

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

aad61439e6a00bdb72cb649e11f6e166590c5f66