| commit | b2f9452bd5234d573898bbda52a410b154f8f510 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 13 18:20:40 2011 +1200 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 13 18:20:40 2011 +1200 |
| tree | b2599fdd3247befb52f9b5c64b99aed6f6db195e | |
| parent | 65112dccf8a113737684366349d7f9ec373ddc47 [diff] | |
| parent | f7f43cc84152e53b5687cd0eb8823310ba065524 [diff] |
Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux * 'btrfs-3.0' of git://github.com/chrismason/linux: Btrfs: make sure not to defrag extents past i_size Btrfs: fix recursive auto-defrag