diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-06 20:00:59 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-06 20:00:59 +0200 |
commit | 10387e5eb45c6e48d67102b88229f5bc6037461c (patch) | |
tree | 77b305e7db8aa0b8b451c96f33aed66bf1a8a50f /fs | |
parent | [PATCH] FRV: Use the generic time stuff for FRV (diff) | |
parent | [PATCH] myri10ge: update the firmware download URL in Kconfig (diff) | |
download | linux-10387e5eb45c6e48d67102b88229f5bc6037461c.tar.xz linux-10387e5eb45c6e48d67102b88229f5bc6037461c.zip |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions