Merge branch 'for-linus' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Sun, 12 Apr 2015 02:29:51 +0000 (22:29 -0400)
commitdfea934575164497a9e36074ebce606a1a278ed9
treeb39ec564ae5a84956af80ae43de24c4f91720519
parent165f1a6e300d5a1ffb57cf9a9c8762de731228f2
parent64b4e2526d1cf6e6a4db6213d6e2b6e6ab59479a
Merge branch 'for-linus' into for-next
fs/aio.c
fs/ocfs2/file.c
include/linux/fs.h