diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:29:02 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-19 13:29:02 -0800 |
commit | 874ff01bd9183ad16495acfd54e93a619d12b8b5 (patch) | |
tree | e9527e94649fadfa705dae64018e027e51681b88 /net/ipv4/Kconfig | |
parent | ebbe46f73a11a667df59cb8e58b371c0a35f29d0 (diff) | |
parent | 86aae08faa0069a559ba543ff3dab33fe95f891b (diff) | |
download | blackbird-op-linux-874ff01bd9183ad16495acfd54e93a619d12b8b5.tar.gz blackbird-op-linux-874ff01bd9183ad16495acfd54e93a619d12b8b5.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (25 commits)
Documentation/kernel-docs.txt update.
arch/cris: typo in KERN_INFO
Storage class should be before const qualifier
kernel/printk.c: comment fix
update I/O sched Kconfig help texts - CFQ is now default, not AS.
Remove duplicate listing of Cris arch from README
kbuild: more doc. cleanups
doc: make doc. for maxcpus= more visible
drivers/net/eexpress.c: remove duplicate comment
add a help text for BLK_DEV_GENERIC
correct a dead URL in the IP_MULTICAST help text
fix the BAYCOM_SER_HDX help text
fix SCSI_SCAN_ASYNC help text
trivial documentation patch for platform.txt
Fix typos concerning hierarchy
Fix comment typo "spin_lock_irqrestore".
Fix misspellings of "agressive".
drivers/scsi/a100u2w.c: trivial typo patch
Correct trivial typo in log2.h.
Remove useless FIND_FIRST_BIT() macro from cardbus.c.
...
Diffstat (limited to 'net/ipv4/Kconfig')
-rw-r--r-- | net/ipv4/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index 503e7059e312..91f3a5cdbcf8 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -9,7 +9,7 @@ config IP_MULTICAST intend to participate in the MBONE, a high bandwidth network on top of the Internet which carries audio and video broadcasts. More information about the MBONE is on the WWW at - <http://www-itg.lbl.gov/mbone/>. Information about the multicast + <http://www.savetz.com/mbone/>. Information about the multicast capabilities of the various network cards is contained in <file:Documentation/networking/multicast.txt>. For most people, it's safe to say N. |