]> 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)
commitb4e48dc749e07f09bcf2283105babeaa24e6e37a
tree017a66e7b0c2d928d3edc9531cf04bd3debf346a
parent869ca1d4f41ec9d215fe9e855eb31eeb006b8c9c
parente3fc0084f0c33f89dbc074ff6338cd381297a823
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