From: John W. Linville Date: Fri, 26 May 2006 20:12:24 +0000 (-0400) Subject: Merge branch 'upstream-fixes' into upstream X-Git-Tag: v2.6.18-rc1~1115^2~23^2~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1141f6d5dead296adcabd4a1e8ea2b994e287cb;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'upstream-fixes' into upstream --- b1141f6d5dead296adcabd4a1e8ea2b994e287cb