]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebd6c17 d279490)
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)
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
  [PATCH] myri10ge: update the firmware download URL in Kconfig


Trivial merge
Linux 2.6 source tree