From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 3 Nov 2006 01:22:24 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v3.12-rc1~31920^2~20^2~240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed;p=kernel%2Fkernel-generic.git

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

* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  [CIFS] report rename failure when target file is locked by Windows
  [CIFS] Allow null user connections
  [CIFS] Fix readdir breakage when blocksize set too small
---

0b0e0b5f1a22c20c0f127fb9b457136d6c3ca8ed