From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Jan 2012 22:57:55 +0000 (-0800)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b;hp=8d9cbf8240023f5b6d19f2106aff3d7077fc4a3b

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
---