Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:28 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:28 +0000 (15:38 +0100)
commit5f1b5664d97842bc5dba40c2053bf95270b6ff7a
tree28d6a3aaf9c095ab2703634693615559329ee3b2
parent388f7b1d6e8ca06762e2454d28d6c3c55ad0fe95
parent65bfa6580791f8c01fbc9cd8bd73d92aea53723f
Merge branch 'chandan/prep-subpage-blocksize' into for-chris-4.6

# Conflicts:
# fs/btrfs/file.c
fs/btrfs/ctree.h
fs/btrfs/file.c
fs/btrfs/inode.c
fs/btrfs/ioctl.c