summaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-13 18:20:40 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-13 18:20:40 +1200
commitb2f9452bd5234d573898bbda52a410b154f8f510 (patch)
treeb2599fdd3247befb52f9b5c64b99aed6f6db195e /drivers/ide
parent65112dccf8a113737684366349d7f9ec373ddc47 (diff)
parentf7f43cc84152e53b5687cd0eb8823310ba065524 (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
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions