From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 17 May 2006 18:54:09 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~23^2~15
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=59d4b684fbe74b25ac8593f39d2aaa86aa485b1f;p=safe%2Fjmp%2Flinux-2.6

Merge branch 'upstream-fixes' into upstream
---

59d4b684fbe74b25ac8593f39d2aaa86aa485b1f