From: Jeff Garzik <jeff@garzik.org>
Date: Thu, 8 Jun 2006 19:55:45 +0000 (-0400)
Subject: Merge branch 'upstream-fixes' into upstream
X-Git-Tag: v2.6.18-rc1~1115^2~22
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcd618e4eac6fbf82de05d23c15ecb694c62b8af;p=linux-2.6

Merge branch 'upstream-fixes' into upstream

Conflicts:

	drivers/net/e1000/e1000_ethtool.c
---

bcd618e4eac6fbf82de05d23c15ecb694c62b8af