Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

Browse source

* 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)

...

This commit is contained in:

Linus Torvalds 2006-12-01 16:40:13 -08:00

parent 1399ff5474 8d6286fdfd

commit 6b8cc71ab2

2 changed files with 29 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

6

fs/cifs/inode.c

View file

33

fs/cifs/link.c

View file