Merge commit '9f12600fe425bc28f0ccba034a77783c09c15af4' into for-linus
authorAl Viro <viro@zeniv.linux.org.uk>
Thu, 12 Jun 2014 04:27:11 +0000 (00:27 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Thu, 12 Jun 2014 04:28:09 +0000 (00:28 -0400)
commit9c1d5284c79fea050f115eadeec1dd1758e5c630
tree4d16fd5aad7ff4931e985c0128c5747f23561f8a
parent5f073850602084fbcbb987948ff3e70ae273f7d2
parent9f12600fe425bc28f0ccba034a77783c09c15af4
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>
fs/afs/internal.h
fs/splice.c
fs/xfs/xfs_file.c
mm/filemap.c