Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jun 2011 15:35:04 +0000 (08:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jun 2011 15:35:04 +0000 (08:35 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
  cifs: fix wsize negotiation to respect max buffer size and active signing (try #4)
  CIFS: Fix problem with 3.0-rc1 null user mount failure


Trivial merge