]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 86f5a2e 78671ca)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Apr 2010 18:58:14 +0000 (11:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Apr 2010 18:58:14 +0000 (11:58 -0700)
commit0ca575abf14e550b084315d27495a9d02aab5255
tree210582aade8b4342b2abfbc3682dd2014456d23btree | snapshot
parent86f5a2e3cb8891cc1931a19b00c442f1ad3eee60commit | diff
parent78671ca685a7a099ef58e609796364a6c94a04c6commit | 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
fs/cifs/cifssmb.c diff1 | diff2 | blob | history
fs/cifs/file.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.