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)
Conflicts:

drivers/net/e1000/e1000_ethtool.c

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

Simple merge
Simple merge