diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-06 14:00:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-06 14:00:59 -0400 |
| commit | 10387e5eb45c6e48d67102b88229f5bc6037461c (patch) | |
| tree | 77b305e7db8aa0b8b451c96f33aed66bf1a8a50f /mm/slab.c | |
| parent | ebd6c17109aed086908ae3b0949265fd07712659 (diff) | |
| parent | d279490543ee4e7c51371eb605b578ab47f45305 (diff) | |
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 'mm/slab.c')
0 files changed, 0 insertions, 0 deletions