Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 21 Aug 2015 06:31:20 +0000 (02:31 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 21 Aug 2015 06:31:20 +0000 (02:31 -0400)
Conflicts:
include/linux/fs.h


Trivial merge