tree c97acbb983530b070e28c70825e0eedbbdb97ab2
parent eb81071584bed0b04adcaf57e525638d0f92e1e1
parent b1c8d2b421376bc941823ee93e36cb491609b02c
author Linus Torvalds <torvalds@linux-foundation.org> 1224783816 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224783816 -0700

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: handle the TCP_Server_Info->tsk field more carefully
  cifs: fix unlinking of rename target when server doesn't support open file renames
  [CIFS] improve setlease handling
  [CIFS] fix saving of resume key before CIFSFindNext
  cifs: make cifs_rename handle -EACCES errors
  [CIFS] fix build error
  [CIFS] undo changes in cifs_rename_pending_delete if it errors out
  cifs: track DeletePending flag in cifsInodeInfo
  cifs: don't use CREATE_DELETE_ON_CLOSE in cifs_rename_pending_delete
  [CIFS] eliminate usage of kthread_stop for cifsd
  [CIFS] Add nodfs mount option