Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik
2006-09-06 11:06:44 -04:00

View File

@@ -2418,7 +2418,7 @@ config MYRI10GE
you will need a newer firmware image.
You may get this image or more information, at:
<http://www.myri.com/Myri-10G/>
<http://www.myri.com/scs/download-Myri10GE.html>
To compile this driver as a module, choose M here and read
<file:Documentation/networking/net-modules.txt>. The module