diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 11:19:32 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-05-13 11:19:32 +0900 |
commit | 19726630c69eb373d6d5d4f3934c2ed540914344 (patch) | |
tree | a8410d1a9c8b3e8ad974687fb21e9d075a7ea65e /arch | |
parent | 2ddb5998d0538bc720288486af3af243af5bac0a (diff) | |
parent | a87c9ad956676d84d459739fc14ec5a3c3565717 (diff) | |
download | linux-19726630c69eb373d6d5d4f3934c2ed540914344.tar.gz linux-19726630c69eb373d6d5d4f3934c2ed540914344.tar.bz2 linux-19726630c69eb373d6d5d4f3934c2ed540914344.zip |
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
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions