tree f8ab7da88c9181b49ca272ccb34ff53de5a9f2d4
parent 9404ef02974a5411687b6c1b8ef3984305620e02
parent e691b9d1a096fbaaff9d6d6aef1adc593b786e62
author Linus Torvalds <torvalds@linux-foundation.org> 1210624155 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1210624155 -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] don't allow demultiplex thread to exit until kthread_stop is called
  [CIFS] when not using unix extensions, check for and set ATTR_READONLY on create and mkdir
  [CIFS]  add local struct inode pointer to cifs_setattr
  [CIFS] cifs_find_tcp_session cleanup