From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Apr 2012 01:37:09 +0000 (-0700)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.4-rc2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=43f63c8711ce02226b7bbdafeba7b8031faf3fb4;p=platform%2Fkernel%2Flinux-3.10.git

Merge git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  Fix UNC parsing on mount
  Remove unnecessary check for NULL in password parser
  CIFS: Fix VFS lock usage for oplocked files
  Revert "CIFS: Fix VFS lock usage for oplocked files"
  cifs: writing past end of struct in cifs_convert_address()
  cifs: silence compiler warnings showing up with gcc-4.7.0
  CIFS: Fix VFS lock usage for oplocked files
---

43f63c8711ce02226b7bbdafeba7b8031faf3fb4