diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 07:47:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-10 07:47:11 -0800 |
| commit | f3ea597251ac859a1c0e7b9e266877f1ac828009 (patch) | |
| tree | 4cd4dd499d36fbb0699e854b038e2260cff7d5cd /fs/nilfs2/file.c | |
| parent | f9f265f35578c5fb2266d0e2a1aa5b57f6fdb36a (diff) | |
| parent | 20054bd65703f7504a9daceabc2a060828fde36c (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: use CreationTime like an i_generation field
cifs: switch cifs_open and cifs_create to use CIFSSMBUnixSetFileInfo
cifs: show "acl" in DebugData Features when it's compiled in
cifs: move "ntlmssp" and "local_leases" options out of experimental code
cifs: replace some hardcoded values with preprocessor constants
cifs: remove unnecessary locking around sequence_number
[CIFS] Fix minor merge conflict in fs/cifs/dir.c
CIFS: Simplify cifs_open code
CIFS: Simplify non-posix open stuff (try #2)
CIFS: Add match_port check during looking for an existing connection (try #4)
CIFS: Simplify ipv*_connect functions into one (try #4)
cifs: Support NTLM2 session security during NTLMSSP authentication [try #5]
cifs: don't overwrite dentry name in d_revalidate
Diffstat (limited to 'fs/nilfs2/file.c')
0 files changed, 0 insertions, 0 deletions