From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Nov 2008 19:43:59 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.28-rc4~89
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a75952b72a0fff3031124003e62118111aed42c1;p=linux-2.6-omap-h63xx.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: fix renaming one hardlink on top of another
  [CIFS] fix error in smb_send2
  [CIFS] Reduce number of socket retries in large write path
---

a75952b72a0fff3031124003e62118111aed42c1