diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-13 02:20:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-13 02:20:40 -0400 |
| commit | b2f9452bd5234d573898bbda52a410b154f8f510 (patch) | |
| tree | b2599fdd3247befb52f9b5c64b99aed6f6db195e /drivers/net/can | |
| parent | 65112dccf8a113737684366349d7f9ec373ddc47 (diff) | |
| parent | f7f43cc84152e53b5687cd0eb8823310ba065524 (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/net/can')
0 files changed, 0 insertions, 0 deletions