diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-15 16:06:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-15 16:06:08 -0500 |
| commit | 0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41 (patch) | |
| tree | b80b1d344ec24cad28b057ef803cebac9434be01 /fs/ocfs2/cluster/nodemanager.c | |
| parent | 70eff55d2d979cca700aa6906494f0c474f3f7ff (diff) | |
| parent | 101142c37be8e5af9b847860219217e6b958c739 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/ocfs2/cluster/nodemanager.c')
| -rw-r--r-- | fs/ocfs2/cluster/nodemanager.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c index af2070da308b..709fba25bf7e 100644 --- a/fs/ocfs2/cluster/nodemanager.c +++ b/fs/ocfs2/cluster/nodemanager.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/sysctl.h> | 24 | #include <linux/sysctl.h> |
| 25 | #include <linux/configfs.h> | 25 | #include <linux/configfs.h> |
| 26 | 26 | ||
| 27 | #include "endian.h" | ||
| 28 | #include "tcp.h" | 27 | #include "tcp.h" |
| 29 | #include "nodemanager.h" | 28 | #include "nodemanager.h" |
| 30 | #include "heartbeat.h" | 29 | #include "heartbeat.h" |