Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
commit143e859d05d0abf4c3b67c64c93695d59fd41342
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jun 2011 15:35:04 +0000 (24 08:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jun 2011 15:35:04 +0000 (24 08:35 -0700)
tree4d2539b109ccc76775dc45e07e02694399f81002
parent46e4edbf7ea9cf26665eb9f90c0fc7688d1a51ed
parent1190f6a067bf27b2ee7e06ec0776a17fe0f6c4d8
Merge git://git./linux/kernel/git/sfrench/cifs-2.6

* 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