diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:40:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:40:13 -0800 |
| commit | 6b8cc71ab2619a776b02869fd733ac1ead3db4e8 (patch) | |
| tree | 5d2f92fc47f72a8da38658e75f2369e7fbae93a4 /fs/lockd/svc.c | |
| parent | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (diff) | |
| parent | 8d6286fdfd290589f8446ec1503702227263dcfd (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 timezone handling on stat to os/2
[CIFS] Incorrect hardlink count when original file is cached (oplocked)
Diffstat (limited to 'fs/lockd/svc.c')
0 files changed, 0 insertions, 0 deletions