tree c8898ae7a5bf00f315cfaa13d58a08aafa5002f9
parent 56299378726d5f2ba8d3c8cbbd13cb280ba45e4f
parent de1b794130b130e77ffa975bb58cb843744f9ae5
author Linus Torvalds <torvalds@linux-foundation.org> 1308676955 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1308676955 -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:
  jbd2: Fix oops in jbd2_journal_remove_journal_head()
  jbd2: Remove obsolete parameters in the comments for some jbd2 functions
  ext4: fixed tracepoints cleanup
  ext4: use FIEMAP_EXTENT_LAST flag for last extent in fiemap
  ext4: Fix max file size and logical block counting of extent format file
  ext4: correct comments for ext4_free_blocks()