| commit | 6b8cc71ab2619a776b02869fd733ac1ead3db4e8 | |
| author | Linus Torvalds <torvalds@woody.osdl.org> | |
| Sat, 2 Dec 2006 00:40:13 +0000 (1 16:40 -0800) | ||
| committer | Linus Torvalds <torvalds@woody.osdl.org> | |
| Sat, 2 Dec 2006 00:40:13 +0000 (1 16:40 -0800) | ||
| tree | 5d2f92fc47f72a8da38658e75f2369e7fbae93a4 | treesnapshot (tar.gz zip) |
| parent | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 | commitdiff |
| parent | 8d6286fdfd290589f8446ec1503702227263dcfd | commitdiff |
Merge git://git./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)
* 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)