diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-26 23:18:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-08-26 23:18:49 -0400 |
| commit | 8dbc16033e35c7443cd56cb5ba308bb19cb7b469 (patch) | |
| tree | f849df3b657763ff401024a828e86b0b57af102c /CREDITS | |
| 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 'CREDITS')
| -rw-r--r-- | CREDITS | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -2209,7 +2209,7 @@ S: (address available on request) | |||
| 2209 | S: USA | 2209 | S: USA |
| 2210 | 2210 | ||
| 2211 | N: Ian McDonald | 2211 | N: Ian McDonald |
| 2212 | E: iam4@cs.waikato.ac.nz | 2212 | E: ian.mcdonald@jandi.co.nz |
| 2213 | E: imcdnzl@gmail.com | 2213 | E: imcdnzl@gmail.com |
| 2214 | W: http://wand.net.nz/~iam4 | 2214 | W: http://wand.net.nz/~iam4 |
| 2215 | W: http://imcdnzl.blogspot.com | 2215 | W: http://imcdnzl.blogspot.com |