summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-12 13:46:27 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-12 13:46:27 -0700
commita3b5960ebd660c9ab92fce9a01d1905ff9b981cb (patch)
treef636ecb2ff88ae724243445b6eef2e6b2d773200 /arch
parent37b0d1dedcedf555e2940bc7702c11e2b572299f (diff)
parent42d1d52e695d87475846e9a09964cae1209eeecb (diff)
downloadlinux-3.10-a3b5960ebd660c9ab92fce9a01d1905ff9b981cb.tar.gz
linux-3.10-a3b5960ebd660c9ab92fce9a01d1905ff9b981cb.tar.bz2
linux-3.10-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