review.tizen.org Git - platform/kernel/linux-starfive.git/commit

projects / platform / kernel / linux-starfive.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 5f07385 9f12600)

author	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 12 Jun 2014 04:27:11 +0000 (00:27 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Thu, 12 Jun 2014 04:28:09 +0000 (00:28 -0400)
commit	9c1d5284c79fea050f115eadeec1dd1758e5c630
tree	4d16fd5aad7ff4931e985c0128c5747f23561f8a	tree \| snapshot
parent	5f073850602084fbcbb987948ff3e70ae273f7d2	commit \| diff
parent	9f12600fe425bc28f0ccba034a77783c09c15af4	commit \| 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>

fs/afs/internal.h	diff1 \|	diff2 \|	blob \| history
fs/splice.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_file.c	diff1 \|	diff2 \|	blob \| history
mm/filemap.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;