projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bf3b0d f779b2d)
Merge git://github.com/davem330/net
authorLinus Torvalds <[email protected]>
Mon, 19 Sep 2011 14:48:04 +0000 (07:48 -0700)
committerLinus Torvalds <[email protected]>
Mon, 19 Sep 2011 14:48:04 +0000 (07:48 -0700)
* git://github.com/davem330/net:
  tcp: fix validation of D-SACK
  tcp: fix build error if !CONFIG_SYN_COOKIES


Trivial merge
John Crispins staging tree