]> 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)
commitac2b4916ed6ff171931c6398c79d40ab30c8c287
tree28d6a3aaf9c095ab2703634693615559329ee3b2
parent422610dfd6cd429199bef194ed3367db0f624612
parentd257a20fa78267a6903d713c3d374a7a948a3b5a
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