projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ae83e25 b89498a)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 19 May 2006 23:48:54 +0000 (16:48 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 19 May 2006 23:48:54 +0000 (16:48 -0700)
commitfee9167214e8e515b2a1f68afc34187f2b59c182
tree8b12deac1bc4c988d12a8a868ec32161943bbc91tree | snapshot
parentae83e255045ed3cdc798664e8e189aa5cf2702ebcommit | diff
parentb89498a1c2941c00889dd025f52dcb653a5083bccommit | diff
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [SCTP]: Allow linger to abort 1-N style sockets.
  [SCTP]: Validate the parameter length in HB-ACK chunk.
  [SCTP]: Respect the real chunk length when walking parameters.
  [SCTP]: A better solution to fix the race between sctp_peeloff() and
  [SCTP]: Set sk_err so that poll wakes up after a non-blocking connect failure.
John Crispins staging tree