merge d_materialise_unique() into d_splice_alias()
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 13 Oct 2014 02:16:02 +0000 (22:16 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 19 Nov 2014 18:01:19 +0000 (13:01 -0500)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
fs/dcache.c
include/linux/dcache.h

diff --cc fs/dcache.c
Simple merge
Simple merge