From: Linus Torvalds <torvalds@woody.osdl.org>
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: v3.12-rc1~31383^2~47^2~576
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6b8cc71ab2619a776b02869fd733ac1ead3db4e8;p=kernel%2Fkernel-generic.git

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

6b8cc71ab2619a776b02869fd733ac1ead3db4e8