Merge git://github.com/davem330/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Sep 2011 14:48:04 +0000 (07:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Sep 2011 14:48:04 +0000 (07:48 -0700)
commit1f0772fe27aa03764478bd9d3a4cbad417a854cc
treea67c60edbcbb33a7e0706299dbaabf53e66bd193
parent6bf3b0dc32a27c6e1ba3dcdaf428a043113cd389
parentf779b2d60ab95c17f1e025778ed0df3ec2f05d75
Merge git://github.com/davem330/net

* git://github.com/davem330/net:
  tcp: fix validation of D-SACK
  tcp: fix build error if !CONFIG_SYN_COOKIES