]> 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)
commit1e3ef012669ab8e1ad9da663ecef26e8d86c888c
treeb2599fdd3247befb52f9b5c64b99aed6f6db195e
parent143ee09f59076998013aa65bae60ffef02e73fe7
parentb02bbe70da68b1822eb241277e6145469fd1c6be
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