Merge branch 'upstream-fixes' into upstream
authorJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000 (15:55 -0400)
committerJeff Garzik <jeff@garzik.org>
Thu, 8 Jun 2006 19:55:45 +0000 (15:55 -0400)
commitbcd618e4eac6fbf82de05d23c15ecb694c62b8af
treee1a85b6a5f10c7ac20ef3b3357e15c5802dca019
parentba9b28d19a3251bb1dfe6a6f8cc89b96fb85f683
parentcb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a
Merge branch 'upstream-fixes' into upstream

Conflicts:

drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_ethtool.c
drivers/net/e1000/e1000_main.c