summaryrefslogtreecommitdiffstats
path: root/Documentation/networking/bridge.txt
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-01-19 23:51:37 +0100
committerPatrick McHardy <kaber@trash.net>2011-01-19 23:51:37 +0100
commit14f0290ba44de6ed435fea24bba26e7868421c66 (patch)
tree449d32e4848007e3edbcab14fa8e09fdc66608ed /Documentation/networking/bridge.txt
parentnetfilter: nf_conntrack: fix lifetime display for disabled connections (diff)
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne... (diff)
downloadlinux-14f0290ba44de6ed435fea24bba26e7868421c66.tar.xz
linux-14f0290ba44de6ed435fea24bba26e7868421c66.zip
Merge branch 'master' of /repos/git/net-next-2.6
Diffstat (limited to 'Documentation/networking/bridge.txt')
-rw-r--r--Documentation/networking/bridge.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/networking/bridge.txt b/Documentation/networking/bridge.txt
index bec69a8a1697..a7ba5e4e2c91 100644
--- a/Documentation/networking/bridge.txt
+++ b/Documentation/networking/bridge.txt
@@ -1,8 +1,8 @@
In order to use the Ethernet bridging functionality, you'll need the
userspace tools. These programs and documentation are available
-at http://www.linux-foundation.org/en/Net:Bridge. The download page is
+at http://www.linuxfoundation.org/en/Net:Bridge. The download page is
http://prdownloads.sourceforge.net/bridge.
If you still have questions, don't hesitate to post to the mailing list
-(more info http://lists.osdl.org/mailman/listinfo/bridge).
+(more info https://lists.linux-foundation.org/mailman/listinfo/bridge).