tree ab4318b72be4635c1213aa0def631e1169307660
parent 55fb78a3a80348d87b2e3d79f61f8a9252dd86f5
parent 7d8f98769e7f4bc29c38789daeb416c6a7d7c241
author Linus Torvalds <torvalds@linux-foundation.org> 1293151008 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1293151008 -0800

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

* '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