projects / platform / kernel / linux-amlogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 65112dc f7f43cc)
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)
* 'btrfs-3.0' of git://github.com/chrismason/linux:
  Btrfs: make sure not to defrag extents past i_size
  Btrfs: fix recursive auto-defrag

1  2 
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ioctl.c
Simple merge
Domain: System / Kernel;