Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 27 Aug 2006 03:18:49 +0000 (20:18 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 27 Aug 2006 03:18:49 +0000 (20:18 -0700)
commit8dbc16033e35c7443cd56cb5ba308bb19cb7b469
treef849df3b657763ff401024a828e86b0b57af102c
parent81a42d298d8bd1b96be4bd459494f25fdd99b594
parent80193aee18bc862e284ba18504f3a3e14706a997
Merge /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/