tree ed4460a8f072cd088e225163bdeeafc5ce9fecb6
parent 8f627a8a881481598c2591c3acc122fb9be7bac4
parent 31be83aeaee22fa165862ad449c7131ceaf1cf91
author Linus Torvalds <torvalds@linux-foundation.org> 1300470652 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1300470652 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs:
  omfs: make readdir stop when filldir says so
  omfs: merge unlink() and rmdir(), close leak in rename()
  omfs: stop playing silly buggers with omfs_unlink() in ->rename()
  omfs: rename() needs to mark old_inode dirty after ctime update