]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'btrfs-3.0' of git://github.com/chrismason/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Oct 2011 06:20:40 +0000 (18:20 +1200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 13 Oct 2011 06:20:40 +0000 (18:20 +1200)
commit2bd66c900e087067ee8317fac6ff92bbf2067407
treeb2599fdd3247befb52f9b5c64b99aed6f6db195e
parent65feb5df88186717dcde0c6046b6d35fc17c6137
parente64141c299b56aa87fbf51c67cfe4ce6907caeb4
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
fs/btrfs/ioctl.c