diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-26 20:18:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-26 20:18:49 -0700 |
| commit | 8dbc16033e35c7443cd56cb5ba308bb19cb7b469 (patch) | |
| tree | f849df3b657763ff401024a828e86b0b57af102c /net/dccp/ccids/lib/tfrc.h | |
| parent | 81a42d298d8bd1b96be4bd459494f25fdd99b594 (diff) | |
| parent | 80193aee18bc862e284ba18504f3a3e14706a997 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[DCCP]: Introduce dccp_rx_hist_find_entry
[DCCP]: Introduces follows48 function
[DCCP]: Update contact details and copyright
[DCCP]: Fix typo
[IPV6]: Segmentation offload not set correctly on TCP children
[CONNECTOR]: Add userspace example code into Documentation/connector/
Diffstat (limited to 'net/dccp/ccids/lib/tfrc.h')
| -rw-r--r-- | net/dccp/ccids/lib/tfrc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/ccids/lib/tfrc.h b/net/dccp/ccids/lib/tfrc.h index 130c4c40cfe3..45f30f59ea2a 100644 --- a/net/dccp/ccids/lib/tfrc.h +++ b/net/dccp/ccids/lib/tfrc.h @@ -4,7 +4,7 @@ * net/dccp/ccids/lib/tfrc.h * * Copyright (c) 2005 The University of Waikato, Hamilton, New Zealand. - * Copyright (c) 2005 Ian McDonald <iam4@cs.waikato.ac.nz> + * Copyright (c) 2005 Ian McDonald <ian.mcdonald@jandi.co.nz> * Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@conectiva.com.br> * Copyright (c) 2003 Nils-Erik Mattsson, Joacim Haggmark, Magnus Erixzon * |