From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 21 Jun 2011 17:22:35 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v3.0-rc5~53
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=890879cfa08f5ceaa09810611f46e890f7d57ff6;p=people%2Fpauldu%2Flinux.git

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()
---

890879cfa08f5ceaa09810611f46e890f7d57ff6