From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 15 Aug 2011 15:36:30 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
X-Git-Tag: v3.12-rc1~4971
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa2b1cf5ca44811ab842c1cd8d32f95b8f51e557;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: Do not set cifs/ntfs acl using a file handle (try #4)
  [CIFS] Cleanup use of CONFIG_CIFS_STATS2 ifdef to make transport routines more readable
---

aa2b1cf5ca44811ab842c1cd8d32f95b8f51e557