aboutsummaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-02-25 00:02:05 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-25 00:02:05 -0800
commitf11c179eea77b8afc2fb7cb4b9a8815b85e3c16f (patch)
tree9edf1e86fbb91815f31d7728820d098041f03bb9 /net/ipv4
parent4545a3f2765bb7d2d93468a8ffa578ac87a2c5c7 (diff)
parent0c9a3aaaf30e1d1994de58c554ef97a719e20892 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/wireless/orinoco/orinoco.c
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_scalable.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c
index 2747ec7bfb6..4660b088a8c 100644
--- a/net/ipv4/tcp_scalable.c
+++ b/net/ipv4/tcp_scalable.c
@@ -1,6 +1,6 @@
/* Tom Kelly's Scalable TCP
*
- * See htt://www-lce.eng.cam.ac.uk/~ctk21/scalable/
+ * See http://www.deneholme.net/tom/scalable/
*
* John Heffner <jheffner@sc.edu>
*/