diff options
author | Linus Torvalds | 2011-06-24 08:35:04 -0700 |
---|---|---|
committer | Linus Torvalds | 2011-06-24 08:35:04 -0700 |
commit | 143e859d05d0abf4c3b67c64c93695d59fd41342 (patch) | |
tree | 4d2539b109ccc76775dc45e07e02694399f81002 /net/key | |
parent | 46e4edbf7ea9cf26665eb9f90c0fc7688d1a51ed (diff) | |
parent | 1190f6a067bf27b2ee7e06ec0776a17fe0f6c4d8 (diff) |
Merge git://git.kernel.org/pub/scm/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
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions