From: Linus Torvalds Date: Wed, 6 Sep 2006 18:00:59 +0000 (-0700) Subject: Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=10387e5eb45c6e48d67102b88229f5bc6037461c;p=deliverable%2Flinux.git Merge branch 'upstream-linus' of /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 --- 10387e5eb45c6e48d67102b88229f5bc6037461c