diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 20:58:14 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 20:58:14 +0200 |
commit | 9ddd3a31aedcdb55d5509b595c04b187041c8adb (patch) | |
tree | 210582aade8b4342b2abfbc3682dd2014456d23b /drivers | |
parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | not overwriting file_lock structure after GET_LK (diff) | |
download | linux-9ddd3a31aedcdb55d5509b595c04b187041c8adb.tar.xz linux-9ddd3a31aedcdb55d5509b595c04b187041c8adb.zip |
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
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions