diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 00:45:47 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-12 00:45:47 +0200 |
commit | a97b52022a73ec12e43f0b2c7d4bd1f40f89c81d (patch) | |
tree | 1a35544915a5704fa59c63b43e9f46e20be1e296 /fs/xfs/linux-2.6/xfs_super.c | |
parent | Merge branch 'for-2.6.39' of git://linux-nfs.org/~bfields/linux (diff) | |
parent | ext4: fix data corruption regression by reverting commit 6de9843dab3f (diff) | |
download | linux-a97b52022a73ec12e43f0b2c7d4bd1f40f89c81d.tar.xz linux-a97b52022a73ec12e43f0b2c7d4bd1f40f89c81d.zip |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: fix data corruption regression by reverting commit 6de9843dab3f
ext4: Allow indirect-block file to grow the file size to max file size
ext4: allow an active handle to be started when freezing
ext4: sync the directory inode in ext4_sync_parent()
ext4: init timer earlier to avoid a kernel panic in __save_error_info
jbd2: fix potential memory leak on transaction commit
ext4: fix a double free in ext4_register_li_request
ext4: fix credits computing for indirect mapped files
ext4: remove unnecessary [cm]time update of quota file
jbd2: move bdget out of critical section
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_super.c')
0 files changed, 0 insertions, 0 deletions