Merge branch 'dev/control-ioctl' into for-chris-4.6

Browse source

...

This commit is contained in:

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

parent fa695b01bc d5131b658c

commit f5bc27c71a

3 changed files with 6 additions and 3 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

1

fs/btrfs/ctree.h

View file

5

fs/btrfs/ioctl.c

View file

3

fs/btrfs/super.c

View file