diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-21 13:02:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-21 13:02:17 -0800 |
| commit | 9654640d0af8f2de40ff3807d3695109d3463f54 (patch) | |
| tree | ab279cb78248152fe19d3d2a977f33f883abed40 /fs/ncpfs/inode.c | |
| parent | b5bf28cde894b3bb3bd25c13a7647020562f9ea0 (diff) | |
| parent | 004c46b9e588edf549a39c5db54e37ebd0b3b3ad (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] One line missing from previous commit
[CIFS] mtime bounces from local to remote when cifs nocmtime i_flags overwritten
[CIFS] fix &&/& typo in cifs_setattr()
Diffstat (limited to 'fs/ncpfs/inode.c')
0 files changed, 0 insertions, 0 deletions