diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 10:02:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-06 10:02:12 -0700 |
| commit | 064ea1ae80749f5548a5613e8c7772fbef34c857 (patch) | |
| tree | c262e09fd60b3ee1b51cc302f35965ad7330edc9 /fs/ocfs2/quota_global.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input (diff) | |
| parent | cifs: when server doesn't set CAP_LARGE_READ_X, cap default rsize at MaxBufferSize (diff) | |
| download | linux-dev-064ea1ae80749f5548a5613e8c7772fbef34c857.tar.xz linux-dev-064ea1ae80749f5548a5613e8c7772fbef34c857.zip | |
Merge git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French.
* git://git.samba.org/sfrench/cifs-2.6:
cifs: when server doesn't set CAP_LARGE_READ_X, cap default rsize at MaxBufferSize
cifs: fix parsing of password mount option
Diffstat (limited to 'fs/ocfs2/quota_global.c')
0 files changed, 0 insertions, 0 deletions