From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 17 May 2006 23:11:41 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2
X-Git-Tag: upstream/snapshot3+hdmi~40451
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15eb7105a74a0a5d72d006fec2192b0ec692b5cc;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

* 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2:
  configfs: Make sure configfs_init() is called before consumers.
  configfs: configfs_mkdir() failed to cleanup linkage.
  configfs: Fix a reference leak in configfs_mkdir().
  ocfs2: fix gfp mask in some file system paths
  ocfs2: Don't populate uptodate cache in ocfs2_force_read_journal()
  ocfs2: take meta data lock in ocfs2_file_aio_read()
  ocfs2: take data locks around extend
---

15eb7105a74a0a5d72d006fec2192b0ec692b5cc