]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit '1c4d2b4f8c69a964dc2557d29061c6abd3f337cf' 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)
commit31c8724fe0c72237477a1b5e258b5a6bdd6b340d
tree4d16fd5aad7ff4931e985c0128c5747f23561f8a
parent88de75e0da569024a62e0ae193e8d1d26dbd71ac
parent1c4d2b4f8c69a964dc2557d29061c6abd3f337cf
Merge commit '1c4d2b4f8c69a964dc2557d29061c6abd3f337cf' 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