| commit | 9ddd3a31aedcdb55d5509b595c04b187041c8adb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 08 11:58:14 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 08 11:58:14 2010 -0700 |
| tree | 210582aade8b4342b2abfbc3682dd2014456d23b | |
| parent | d620a7cf05d4f12f5bbb1060d766e8139ab31458 [diff] | |
| parent | f05337c6ac48d19d354e0640a8eb8fc884f82bcc [diff] |
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: not overwriting file_lock structure after GET_LK cifs: Fix a kernel BUG with remote OS/2 server (try #3) [CIFS] initialize nbytes at the beginning of CIFSSMBWrite() [CIFS] Add mmap for direct, nobrl cifs mount types