summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-12 22:46:27 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-12 22:46:27 +0200
commita3b5960ebd660c9ab92fce9a01d1905ff9b981cb (patch)
treef636ecb2ff88ae724243445b6eef2e6b2d773200 /arch
parentMerge master.kernel.org:/home/rmk/linux-2.6-arm (diff)
parent[IPV4]: Increment ipInHdrErrors when TTL expires. (diff)
downloadlinux-a3b5960ebd660c9ab92fce9a01d1905ff9b981cb.tar.xz
linux-a3b5960ebd660c9ab92fce9a01d1905ff9b981cb.zip
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions