tree a67c60edbcbb33a7e0706299dbaabf53e66bd193
parent 6bf3b0dc32a27c6e1ba3dcdaf428a043113cd389
parent f779b2d60ab95c17f1e025778ed0df3ec2f05d75
author Linus Torvalds <torvalds@linux-foundation.org> 1316443684 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316443684 -0700

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