]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge...
authorJoel Becker <jlbec@evilplan.org>
Mon, 28 Mar 2011 16:44:26 +0000 (09:44 -0700)
committerJoel Becker <jlbec@evilplan.org>
Mon, 28 Mar 2011 16:44:26 +0000 (09:44 -0700)
commitaef5f1c0d84b55cb72db7a83dfabb2ff2f88f6f0
treeef68a53e28e9ee53ce9db3642bab5fa5b3d44866
parent45b421fb68efd570bf393d9a5029d923cffecdcb
parentfdcc419d58fb9fdfada7b142607b1784a01b4420
Merge branch 'mlog_replace_for_39' of git://repo.or.cz/taoma-kernel into ocfs2-merge-window-fix
fs/ocfs2/dir.c
fs/ocfs2/dlm/dlmdomain.c
fs/ocfs2/dlmglue.c
fs/ocfs2/ioctl.c