From: Linus Torvalds Date: Mon, 19 Sep 2011 14:48:04 +0000 (-0700) Subject: Merge git://github.com/davem330/net X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1f0772fe27aa03764478bd9d3a4cbad417a854cc;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git 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 --- 1f0772fe27aa03764478bd9d3a4cbad417a854cc