tree 77b305e7db8aa0b8b451c96f33aed66bf1a8a50f
parent ebd6c17109aed086908ae3b0949265fd07712659
parent d279490543ee4e7c51371eb605b578ab47f45305
author Linus Torvalds <torvalds@g5.osdl.org> 1157565659 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1157565659 -0700

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