From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 16 Sep 2013 19:39:21 +0000 (-0400)
Subject: Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.12-rc1~2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=3369d116934b70bd2755cdd8b2af9741d18a4047;p=~andy%2Flinux

Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French:
 "Two minor cifs fixes and a minor documentation cleanup for cifs.txt"

* 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: update cifs.txt and remove some outdated infos
  cifs: Avoid calling unlock_page() twice in cifs_readpage() when using fscache
  cifs: Do not take a reference to the page in cifs_readpage_worker()
---

3369d116934b70bd2755cdd8b2af9741d18a4047