]> Git Repo - linux.git/commitdiff
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <[email protected]>
Fri, 24 Dec 2010 00:36:48 +0000 (16:36 -0800)
committerLinus Torvalds <[email protected]>
Fri, 24 Dec 2010 00:36:48 +0000 (16:36 -0800)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Fix system inodes cache overflow.
  ocfs2: Hold ip_lock when set/clear flags for indexed dir.
  ocfs2: Adjust masklog flag values
  Ocfs2: Teach 'coherency=full' O_DIRECT writes to correctly up_read i_alloc_sem.
  ocfs2/dlm: Migrate lockres with no locks if it has a reference


Trivial merge
This page took 0.051898 seconds and 4 git commands to generate.