Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 19:43:59 +0000 (11:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Nov 2008 19:43:59 +0000 (11:43 -0800)
commita75952b72a0fff3031124003e62118111aed42c1
tree5243016005ebf8060e939db8d7c0c50976b2b315
parent457d2ee225801441e96f2e35894ec404572ad862
parentae6884a9da56f8921e432e663b4ccb4a1851b2ea
Merge git://git./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