Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into for-linus

Browse source

...

This commit is contained in:

Chris Mason 2011-06-10 18:58:08 -04:00

parent 5be76758f3 6eef312588

commit 0e735872fb

2 changed files with 39 additions and 32 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/disk-io.c

View file

69

fs/btrfs/scrub.c

View file