Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
commit890879cfa08f5ceaa09810611f46e890f7d57ff6
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 17:22:35 +0000 (21 10:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 21 Jun 2011 17:22:35 +0000 (21 10:22 -0700)
treec8898ae7a5bf00f315cfaa13d58a08aafa5002f9
parent56299378726d5f2ba8d3c8cbbd13cb280ba45e4f
parentde1b794130b130e77ffa975bb58cb843744f9ae5
Merge branch 'for_linus' of git://git./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()