Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2011 02:53:11 +0000 (14:53 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Oct 2011 02:53:11 +0000 (14:53 +1200)
* git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2


Trivial merge