diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 22:32:14 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-27 22:32:14 +0200 |
commit | af4087e0e682df12bdffec5cfafc2fec9208716e (patch) | |
tree | 564622df71c8b5666be24cbfd93f58516791d180 /arch/m32r | |
parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
parent | btrfs: fix inconsonant inode information (diff) | |
download | linux-af4087e0e682df12bdffec5cfafc2fec9208716e.tar.xz linux-af4087e0e682df12bdffec5cfafc2fec9208716e.zip |
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 'arch/m32r')
0 files changed, 0 insertions, 0 deletions