projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d620a7c f05337c)
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)
* 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

1  2 
fs/cifs/cifssmb.c patch | diff1 | diff2 | blob | history
fs/cifs/file.c patch | diff1 | diff2 | blob | history

diff --cc fs/cifs/cifssmb.c
Simple merge
diff --cc fs/cifs/file.c
Simple merge