From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Jul 2012 17:02:12 +0000 (-0700)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=064ea1ae80749f5548a5613e8c7772fbef34c857;p=linux.git

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

Pull cifs fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: when server doesn't set CAP_LARGE_READ_X, cap default rsize at MaxBufferSize
  cifs: fix parsing of password mount option
---

064ea1ae80749f5548a5613e8c7772fbef34c857