From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 13 May 2014 02:19:32 +0000 (+0900)
Subject: Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v3.15-rc6~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19726630c69eb373d6d5d4f3934c2ed540914344;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French:
 "Small cifs fix for metadata caching"

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix actimeo=0 corner case when cifs_i->time == jiffies
---

19726630c69eb373d6d5d4f3934c2ed540914344