Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Sep 2013 19:39:21 +0000 (15:39 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Sep 2013 19:39:21 +0000 (15:39 -0400)
commit3369d116934b70bd2755cdd8b2af9741d18a4047
tree12c5444ae63bb9d6b00829b26668009d4c87a1c8
parentf1da3458e9d915d72b0dd30a7c41c3aff8f03589
parent81b66220a9ebea7dd1547388279ee1898d7fe0f9
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()