From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 Apr 2010 18:58:14 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ddd3a31aedcdb55d5509b595c04b187041c8adb;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git

Merge git://git./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
---

9ddd3a31aedcdb55d5509b595c04b187041c8adb