From: Linus Torvalds Date: Sat, 2 Dec 2006 00:40:13 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 X-Git-Tag: v2.6.20-rc2~6^2~13^2~480 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6b8cc71ab2619a776b02869fd733ac1ead3db4e8;p=linux-2.6-omap-h63xx.git 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) --- 6b8cc71ab2619a776b02869fd733ac1ead3db4e8