projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c4319c7 52c303c)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 01:52:47 +0000 (17:52 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Mar 2011 01:52:47 +0000 (17:52 -0800)
commit158a5d61f780b707da0b559cf60d72294006aa97
treef4e86dfdca114123f282ba9000ee7470844e91c0tree | snapshot
parentc4319c7db8c3805e4811eaceeee6c2fa51411bd4commit | diff
parent52c303c56c3638944b5f733e3961dc58eb8c7270commit | 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: Check heartbeat mode for kernel stacks only
  Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number.
  ocfs2: Fix estimate of necessary credits for mkdir
John Crispins staging tree