Skip to content
Snippets Groups Projects
Commit 9c1d5284 authored by Al Viro's avatar Al Viro
Browse files

Merge commit '9f12600f' into for-linus 


Backmerge of dcache.c changes from mainline.  It's that, or complete
rebase...

Conflicts:
	fs/splice.c

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parents 5f073850 9f12600f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 96 additions and 55 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment