Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jan 2012 22:57:55 +0000 (14:57 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jan 2012 22:57:55 +0000 (14:57 -0800)
commit8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b
treef795383da4de9b99efb933f02b26d2bdf2746f0d
parentf423fc627b05f47bc9305f9661630fce30f208f9
parent225de11e31c1cecd04839b859a0b8f81d490a50b
Merge git://git.samba.org/sfrench/cifs-2.6

* git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] default ntlmv2 for cifs mount delayed to 3.3
  cifs: fix bad buffer length check in coalesce_t2