| commit | 2838888f3f268344d42ac088c8abcff91c505ced | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 20 10:28:52 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Sep 20 10:28:52 2011 -0700 |
| tree | 764c6557d37d6c80e4cbab852005c55f7b820b94 | |
| parent | d006de93531a9876b26919e9d2bbf562654ab736 [diff] | |
| parent | cfbd6f84c2e26c13ded16b6bb0871edb7d75974f [diff] |
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