Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 17:02:12 +0000 (10:02 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jul 2012 17:02:12 +0000 (10:02 -0700)
commit064ea1ae80749f5548a5613e8c7772fbef34c857
treec262e09fd60b3ee1b51cc302f35965ad7330edc9
parent1b74a8684e3c5cbbe5e798de9e07e3a087c7b853
parentec01d738a1691dfc85b96b9f796020267a7be577
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