diff options
| author | Al Viro <[email protected]> | 2014-06-12 04:27:11 +0000 |
|---|---|---|
| committer | Al Viro <[email protected]> | 2014-06-12 04:28:09 +0000 |
| commit | 9c1d5284c79fea050f115eadeec1dd1758e5c630 (patch) | |
| tree | 4d16fd5aad7ff4931e985c0128c5747f23561f8a /tools/perf/scripts/python/sctop.py | |
| parent | kill generic_file_splice_write() (diff) | |
| parent | dcache: add missing lockdep annotation (diff) | |
| download | kernel-9c1d5284c79fea050f115eadeec1dd1758e5c630.tar.gz kernel-9c1d5284c79fea050f115eadeec1dd1758e5c630.zip | |
Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus
Backmerge of dcache.c changes from mainline. It's that, or complete
rebase...
Conflicts:
fs/splice.c
Signed-off-by: Al Viro <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/sctop.py')
0 files changed, 0 insertions, 0 deletions