tree f795383da4de9b99efb933f02b26d2bdf2746f0d
parent f423fc627b05f47bc9305f9661630fce30f208f9
parent 225de11e31c1cecd04839b859a0b8f81d490a50b
author Linus Torvalds <torvalds@linux-foundation.org> 1325717875 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1325717875 -0800

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