From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Nov 2009 04:29:05 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... 
X-Git-Tag: v2.6.32~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=931ed94430e36b9bea3904572424116092ba5663;p=platform%2Fkernel%2Flinux-stable.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: Trivial cleanup of jbd compatibility layer removal
  ocfs2: Refresh documentation
  ocfs2: return f_fsid info in ocfs2_statfs()
  ocfs2: duplicate inline data properly during reflink.
  ocfs2: Move ocfs2_complete_reflink to the right place.
  ocfs2: Return -EINVAL when a device is not ocfs2.
---

931ed94430e36b9bea3904572424116092ba5663