projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f40334 10cf1a0)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Dec 2009 21:33:07 +0000 (13:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 23 Dec 2009 21:33:07 +0000 (13:33 -0800)
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Set i_nlink properly during reflink.
  ocfs2: Add reflinked file's inode to inode hash eariler.
  ocfs2: refcounttree.c cleanup.
  ocfs2: Find proper end cpos for a leaf refcount block.

1  2 
fs/ocfs2/alloc.c patch | diff1 | diff2 | blob | history
fs/ocfs2/refcounttree.c patch | diff1 | diff2 | blob | history

diff --cc fs/ocfs2/alloc.c
Simple merge
diff --cc fs/ocfs2/refcounttree.c
Simple merge
John Crispins staging tree