tree 764c6557d37d6c80e4cbab852005c55f7b820b94
parent d006de93531a9876b26919e9d2bbf562654ab736
parent cfbd6f84c2e26c13ded16b6bb0871edb7d75974f
author Linus Torvalds <torvalds@linux-foundation.org> 1316539732 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316539732 -0700

Merge git://git.samba.org/sfrench/cifs-2.6

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: Fix broken sec=ntlmv2/i sec option (try #2)
  Fix the conflict between rwpidforward and rw mount options
  CIFS: Fix ERR_PTR dereference in cifs_get_root
  cifs: fix possible memory corruption in CIFSFindNext