]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/um/kernel/skas/mmu.c
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Apr 2010 17:01:51 +0000 (10:01 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Apr 2010 17:01:51 +0000 (10:01 -0700)
commit202f2bb0708e968099a23fead4598a4c3f8f8637
treed014d6222ea90af157cfb0fcbf5677447353b95e
parentddc9b34c3b3bc063a7d9eb891ae09b8f49cfb27e
parentb90f687018e6d6c77d981b09203780f7001407e5
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
fs/ext4/inode.c
fs/ext4/mballoc.c