]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'misc-4.6' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
commit9d2ec6f9c5097aa17c63ca16a2dada9bc046e134
tree017a66e7b0c2d928d3edc9531cf04bd3debf346a
parent1cdac13df6260ab93b5120cf7652033338e9ac7a
parent210aeeb2d3367ea84ad1d31b91ded677eb47346c
Merge branch 'misc-4.6' into for-chris-4.6

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