From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 2 Jun 2008 22:28:45 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... 
X-Git-Tag: v2.6.26-rc5~23
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=28928b2f1d769abdc173c96e2632d30cbde9ec4a;p=linux-2.6-omap-h63xx.git

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

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  [PATCH 3/3] ocfs2/net: Silence build warnings
  [PATCH 2/3] ocfs2/dlm: Silence build warnings
  [PATCH 1/3] ocfs2/net: Silence build warnings
  ocfs2: Rename 'user_stack' plugin structure to 'ocfs2_user_plugin'
---

28928b2f1d769abdc173c96e2632d30cbde9ec4a