diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:42:31 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 05:42:31 -0500 |
| commit | 8163d88c79dca35478a2405c837733ac50ea4c39 (patch) | |
| tree | 6acae066a09b7dcbedab4a35ad62eba4ba3fd83c /net/ipv4/tcp_scalable.c | |
| parent | a1ef58f442542d8b3e3b963339fbc522c36e827c (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into perfcounters/core
Conflicts:
arch/x86/mm/iomap_32.c
Diffstat (limited to 'net/ipv4/tcp_scalable.c')
| -rw-r--r-- | net/ipv4/tcp_scalable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_scalable.c b/net/ipv4/tcp_scalable.c index 2747ec7bfb63..4660b088a8ce 100644 --- a/net/ipv4/tcp_scalable.c +++ b/net/ipv4/tcp_scalable.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* Tom Kelly's Scalable TCP | 1 | /* Tom Kelly's Scalable TCP |
| 2 | * | 2 | * |
| 3 | * See htt://www-lce.eng.cam.ac.uk/~ctk21/scalable/ | 3 | * See http://www.deneholme.net/tom/scalable/ |
| 4 | * | 4 | * |
| 5 | * John Heffner <jheffner@sc.edu> | 5 | * John Heffner <jheffner@sc.edu> |
| 6 | */ | 6 | */ |