| commit | 9c1d5284c79fea050f115eadeec1dd1758e5c630 | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Thu Jun 12 00:27:11 2014 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Thu Jun 12 00:28:09 2014 -0400 |
| tree | 4d16fd5aad7ff4931e985c0128c5747f23561f8a | |
| parent | 5f073850602084fbcbb987948ff3e70ae273f7d2 [diff] | |
| parent | 9f12600fe425bc28f0ccba034a77783c09c15af4 [diff] |
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 <viro@zeniv.linux.org.uk>