Merge branch 'foreign/zhaolei/reada' into for-chris-4.6

Browse source

...

This commit is contained in:

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

parent 23c1a966f2 7aff8cf4a6

commit ff7db6e05a

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

7

fs/btrfs/ctree.h

View file

23

fs/btrfs/disk-io.c

View file

248

fs/btrfs/reada.c

View file