Commit 10387e5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] myri10ge: update the firmware download URL in Kconfig
parents ebd6c171 d2794905

drivers/net/Kconfig

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