]> err.no Git - linux-2.6/commit
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Sep 2006 18:00:59 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 6 Sep 2006 18:00:59 +0000 (11:00 -0700)
commit10387e5eb45c6e48d67102b88229f5bc6037461c
tree77b305e7db8aa0b8b451c96f33aed66bf1a8a50f
parentebd6c17109aed086908ae3b0949265fd07712659
parentd279490543ee4e7c51371eb605b578ab47f45305
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