tree 4179e6189472f3a2434bb5cae01ec8f694881955
parent d8f654ef6a55495e548427b997a388e0d5a1ffb4
parent 3321b791b2e8897323f8c044a0c77ff25781381c
author Linus Torvalds <torvalds@linux-foundation.org> 1253985035 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1253985035 -0700

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:
  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