]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 17:50:52 +0000 (10:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 17:50:52 +0000 (10:50 -0700)
commit3aa790846b3fca726db9616426f1b9d77305232e
treeed4460a8f072cd088e225163bdeeafc5ce9fecb6
parentba0f2965a229b50ab5abf7de1fa59904498b1acb
parentc96fb693f3707e3b566853319cbb4f8e5d6dd4db
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