averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-12-31 22:57:14 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
38da1703060a520e69b00405f9bdf765d1396cd0
linux-stable-mirror/fs/splice.c
Al Viro 9c1d5284c7 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>
2014-06-12 00:28:09 -04:00

46 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink