From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 Jul 2008 15:32:25 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.27-rc1~33
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4f31f3080943c7e3541f07df326f06d598a067d0;p=linux.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  net: missing bits of net-namespace / sysctl
  ipcomp: Fix warnings after ipcomp consolidation.
  dccp: Add check for truncated ICMPv6 DCCP error packets
  dccp: Fix incorrect length check for ICMPv4 packets
  dccp: Add check for sequence number in ICMPv6 message
  dccp: Fix sequence number check for ICMPv4 packets
  dccp: Bug-Fix - AWL was never updated
  dccp: Allow to distinguish original and retransmitted packets
---

4f31f3080943c7e3541f07df326f06d598a067d0