Merge branch 'misc-4.6' into for-chris-4.6

Browse source

# Conflicts:
#	fs/btrfs/file.c

...

This commit is contained in:

David Sterba 2016-02-26 15:38:34 +01:00

parent f004fae0cf f7e98a7fff

commit fa695b01bc

5 changed files with 20 additions and 31 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

fs/btrfs/ctree.h

View file

40

fs/btrfs/file.c

View file

2

fs/btrfs/ioctl.c

View file

6

fs/btrfs/tests/btrfs-tests.c

View file

1

fs/btrfs/tests/free-space-tree-tests.c

View file