tree 5243016005ebf8060e939db8d7c0c50976b2b315
parent 457d2ee225801441e96f2e35894ec404572ad862
parent ae6884a9da56f8921e432e663b4ccb4a1851b2ea
author Linus Torvalds <torvalds@linux-foundation.org> 1225741439 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1225741439 -0800

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