]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit33f704be697e690b2c48b09438782005653fedda
tree28d6a3aaf9c095ab2703634693615559329ee3b2
parent2827ae15dc0f2c90e519a70f2b9ddebe33f2361f
parent93bbbe4f2b13064d74008558ea029d2212bf44a2
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