diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 13:32:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 13:32:14 -0700 |
| commit | af4087e0e682df12bdffec5cfafc2fec9208716e (patch) | |
| tree | 564622df71c8b5666be24cbfd93f58516791d180 /fs/squashfs/super.c | |
| parent | 4699d4423c07a1db35ea9453eac3a07e818338f9 (diff) | |
| parent | 2f7e33d432d097a2a7f467b031bf18be91cb3d49 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
btrfs: fix inconsonant inode information
Btrfs: make sure to update total_bitmaps when freeing cache V3
Btrfs: fix type mismatch in find_free_extent()
Btrfs: make sure to record the transid in new inodes
Diffstat (limited to 'fs/squashfs/super.c')
0 files changed, 0 insertions, 0 deletions