From: John W. Linville <linville@tuxdriver.com>
Date: Wed, 15 Mar 2006 22:02:08 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Tag: v2.6.17-rc1~1186^2^2~26
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd288e7d75b9041f79fecae77d61cfa345da7266;p=linux-2.6

Merge branch 'upstream-fixes'
---

dd288e7d75b9041f79fecae77d61cfa345da7266