From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 May 2008 20:53:07 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v3.12-rc1~20883
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be2e88011bd800222bfd7b477c727966f93186a9;p=kernel%2Fkernel-generic.git

Merge branch 'upstream-linus' of git://git./linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Use GFP_NOFS in kmalloc during localalloc window move
  ocfs2: Allow uid/gid/perm changes of symlinks
  ocfs2/dlm: dlmdebug.c: make 2 functions static
  ocfs2: make struct o2cb_stack_ops static
  ocfs2: make struct ocfs2_control_device static
  ocfs2: Correct merge of 52f7c21 (Move /sys/o2cb to /sys/fs/o2cb)
---

be2e88011bd800222bfd7b477c727966f93186a9