projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 55fb78a 7d8f987)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 00:36:48 +0000 (16:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 00:36:48 +0000 (16:36 -0800)
commiteda4b716ea1f2a647a39cebae66b3fae4c4b80e4
treeab4318b72be4635c1213aa0def631e1169307660tree | snapshot
parent55fb78a3a80348d87b2e3d79f61f8a9252dd86f5commit | diff
parent7d8f98769e7f4bc29c38789daeb416c6a7d7c241commit | diff
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
Linux Kernel tree with some unpolished code for Colibri/Apalis modules