tree b2599fdd3247befb52f9b5c64b99aed6f6db195e
parent 65112dccf8a113737684366349d7f9ec373ddc47
parent f7f43cc84152e53b5687cd0eb8823310ba065524
author Linus Torvalds <torvalds@linux-foundation.org> 1318486840 +1200
committer Linus Torvalds <torvalds@linux-foundation.org> 1318486840 +1200

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