Skip to content
Commit fc371891 authored by Joel Becker's avatar Joel Becker
Browse files

Merge branch 'globalheartbeat-2' of... 

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

Conflicts:
	fs/ocfs2/ocfs2.h
parents 7bdb0d18 d4396eaf
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment