From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Dec 2010 00:36:48 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=eda4b716ea1f2a647a39cebae66b3fae4c4b80e4;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'upstream-linus' of git://git./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
---

eda4b716ea1f2a647a39cebae66b3fae4c4b80e4