From: John W. Linville Date: Tue, 22 Aug 2006 18:42:36 +0000 (-0400) Subject: Merge branch 'from-linus' into upstream X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=69758820a42da207bdc775d6eccf1f9fb67cd62e;p=linux.git Merge branch 'from-linus' into upstream --- 69758820a42da207bdc775d6eccf1f9fb67cd62e