From: Linus Torvalds Date: Sun, 3 Jul 2011 18:12:21 +0000 (-0700) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=070f944a0bb9dd27772fa232bd7648ccc5780548;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge git://git./linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: set socket send and receive timeouts before attempting connect --- 070f944a0bb9dd27772fa232bd7648ccc5780548