]> git.ipfire.org Git - people/ms/linux.git/commit
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)
commit061f98e959ea025a5d87c3e089d59ec2ec5f5d6d
tree4fd1c5d0eb8fd8ee55057dcb2da526d6bbade8d6
parentb5f5914cb8a2745ee4edc9d7f3596d596f1ea1b0
parentac05fbb40062411ea1b722aa2cede7feaa94f1b4
Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git/josef/btrfs-next into for-next

Conflicts:
include/linux/fs.h
fs/super.c
include/linux/fs.h