]> git.baikalelectronics.ru Git - kernel.git/commit
Merge commit 'e2f8ee7dc17fcbe9eb5ad113a493e59569a68b10' 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)
commit8e0538a1e2d372808c4a51cea152999ac571d458
tree4d16fd5aad7ff4931e985c0128c5747f23561f8a
parent0e6fee9f5b13049f442c6be9434812f906c50d7c
parente2f8ee7dc17fcbe9eb5ad113a493e59569a68b10
Merge commit 'e2f8ee7dc17fcbe9eb5ad113a493e59569a68b10' 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