From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Apr 2010 17:01:51 +0000 (-0700)
Subject: Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
X-Git-Tag: v2.6.34-rc6~31
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=202f2bb0708e968099a23fead4598a4c3f8f8637;p=~shefty%2Frdma-dev.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:
  ext4: Issue the discard operation *before* releasing the blocks to be reused
  ext4: Fix buffer head leaks after calls to ext4_get_inode_loc()
  ext4: Fix possible lost inode write in no journal mode
---

202f2bb0708e968099a23fead4598a4c3f8f8637