| commit | 8dbc16033e35c7443cd56cb5ba308bb19cb7b469 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Sat Aug 26 20:18:49 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Sat Aug 26 20:18:49 2006 -0700 |
| tree | f849df3b657763ff401024a828e86b0b57af102c | |
| 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/