From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 27 Aug 2006 03:18:49 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.18-rc5~43
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8dbc16033e35c7443cd56cb5ba308bb19cb7b469;p=linux-2.6-omap-h63xx.git

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/
---

8dbc16033e35c7443cd56cb5ba308bb19cb7b469