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

Conflicts:
	fs/ocfs2/ocfs2.h

diff --cc fs/ocfs2/dlm/dlmdebug.c
Simple merge

diff --cc fs/ocfs2/ocfs2.h
index 3064feef143039f216d3b77235c2925fe6d81109,481387b90b219b135645a2a9996801db36321291..d8408217e3bd0657a3446f77a56833a20f03ad52
--- 1/fs/ocfs2/ocfs2.h
--- 2/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
@@@ -263,9 -256,8 +263,10 @@@ enum ocfs2_mount_option
                                                   control lists */
        OCFS2_MOUNT_USRQUOTA = 1 << 10, /* We support user quotas */
        OCFS2_MOUNT_GRPQUOTA = 1 << 11, /* We support group quotas */
- 
-       OCFS2_MOUNT_COHERENCY_BUFFERED = 1 << 12 /* Allow concurrent O_DIRECT
-                                                   writes */
 -      OCFS2_MOUNT_HB_NONE = 1 << 12, /* No heartbeat */
 -      OCFS2_MOUNT_HB_GLOBAL = 1 << 13, /* Global heartbeat */
++      OCFS2_MOUNT_COHERENCY_BUFFERED = 1 << 12, /* Allow concurrent O_DIRECT
++                                                   writes */
++      OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
++      OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */
  };
  
  #define OCFS2_OSB_SOFT_RO                     0x0001

diff --cc fs/ocfs2/ocfs2_fs.h
Simple merge

diff --cc fs/ocfs2/ocfs2_ioctl.h
Simple merge

diff --cc fs/ocfs2/refcounttree.c
Simple merge

diff --cc fs/ocfs2/suballoc.c
Simple merge

diff --cc fs/ocfs2/super.c
Simple merge

diff --cc include/linux/fs.h
Simple merge