From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 12 Jun 2006 20:46:27 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.17~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a3b5960ebd660c9ab92fce9a01d1905ff9b981cb;p=~shefty%2Frdma-dev.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:
  [IPV4]: Increment ipInHdrErrors when TTL expires.
  [TCP]: continued: reno sacked_out count fix
  [DCCP] Ackvec: fix soft lockup in ackvec handling code
---

a3b5960ebd660c9ab92fce9a01d1905ff9b981cb