aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 08:32:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-28 08:32:25 -0700
commit4f31f3080943c7e3541f07df326f06d598a067d0 (patch)
treee7455c1a8a3991d1e16690a8cf2f7d4f0dd55836 /include
parentSubmittingPatches: add git pull & diffstat format info (diff)
parentMerge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff)
downloadlinux-dev-4f31f3080943c7e3541f07df326f06d598a067d0.tar.xz
linux-dev-4f31f3080943c7e3541f07df326f06d598a067d0.zip
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions