| commit | 061f98e959ea025a5d87c3e089d59ec2ec5f5d6d | [log] [tgz] |
|---|---|---|
| author | Al Viro <viro@zeniv.linux.org.uk> | Fri Aug 21 02:31:20 2015 -0400 |
| committer | Al Viro <viro@zeniv.linux.org.uk> | Fri Aug 21 02:31:20 2015 -0400 |
| tree | 4fd1c5d0eb8fd8ee55057dcb2da526d6bbade8d6 | |
| parent | b5f5914cb8a2745ee4edc9d7f3596d596f1ea1b0 [diff] | |
| parent | ac05fbb40062411ea1b722aa2cede7feaa94f1b4 [diff] |
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