tree 1a35544915a5704fa59c63b43e9f46e20be1e296
parent 18770c7c3a0ccd60017ac76b5d2e7d1f71376b94
parent c8205636029fc869278c55b7336053b3e7ae3ef4
author Linus Torvalds <torvalds@linux-foundation.org> 1302561947 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302561947 -0700

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