Merge branch 'upstream-fixes' into upstream

b4d01327 · Jeff Garzik · a2413598 · d2794905 · b4d01327
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/net/Kconfig drivers/net/Kconfig +1 -1

未找到文件。
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -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