Commit b4d01327 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents a2413598 d2794905

drivers/net/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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