From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 26 Sep 2009 17:10:35 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v2.6.32-rc1~20
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=07e2e6ba2761291aa182993ebba1f490b5005dcc;p=safe%2Fjmp%2Flinux-2.6

Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: fix locking and list handling code in cifs_open and its helper
  [CIFS] Remove build warning
  cifs: fix problems with last two commits
  [CIFS] Fix build break when keys support turned off
  cifs: eliminate cifs_init_private
  cifs: convert oplock breaks to use slow_work facility (try #4)
  cifs: have cifsFileInfo hold an extra inode reference
  cifs: take read lock on GlobalSMBSes_lock in is_valid_oplock_break
  cifs: remove cifsInodeInfo.oplockPending flag
  cifs: fix oplock request handling in posix codepath
  [CIFS] Re-enable Lanman security
---

07e2e6ba2761291aa182993ebba1f490b5005dcc