Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 May 2010 20:53:35 +0000 (13:53 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 17 May 2010 20:53:35 +0000 (13:53 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
  logfs: handle powerfail on NAND flash
  logfs: handle errors from get_mtd_device()
  logfs: remove unused variable
  logfs: fix sync
  logfs: fix compile failure
  logfs: initialize li->li_refcount
  logfs: commit reservations under space pressure
  logfs: survive logfs_buf_recover read errors
  logfs: Close i_ino reuse race
  logfs: fix logfs_seek_hole()
  logfs: Return -EINVAL if filesystem image doesn't match
  LogFS: Fix typo in b6349ac8
  logfs: testing the wrong variable

1  2 
fs/logfs/super.c

Simple merge