diff options
| author | Linus Torvalds <[email protected]> | 2014-05-13 02:19:32 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2014-05-13 02:19:32 +0000 |
| commit | 19726630c69eb373d6d5d4f3934c2ed540914344 (patch) | |
| tree | a8410d1a9c8b3e8ad974687fb21e9d075a7ea65e /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | Merge tag 'md/3.15-fixes' of git://neil.brown.name/md (diff) | |
| parent | cifs: fix actimeo=0 corner case when cifs_i->time == jiffies (diff) | |
| download | kernel-19726630c69eb373d6d5d4f3934c2ed540914344.tar.gz kernel-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 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions