From: Joel Becker <joel.becker@oracle.com>
Date: Fri, 15 Oct 2010 20:03:09 +0000 (-0700)
Subject: Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into... 
X-Git-Tag: v2.6.37-rc1~182^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc3718918f13ad72827d62d36ea0f5fb55090644;p=pandora-kernel.git

Merge branch 'globalheartbeat-2' of git://oss.oracle.com/git/smushran/linux-2.6 into ocfs2-merge-window

Conflicts:
	fs/ocfs2/ocfs2.h
---

fc3718918f13ad72827d62d36ea0f5fb55090644
Reading git-diff-tree failed