]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit9ddd3a31aedcdb55d5509b595c04b187041c8adb
tree210582aade8b4342b2abfbc3682dd2014456d23btree
parentd620a7cf05d4f12f5bbb1060d766e8139ab31458commit | diff
parentf05337c6ac48d19d354e0640a8eb8fc884f82bcccommit | 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
Ubuntu Disco kernel mirror for Proxmox VE and PMG