diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
| commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
| tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /fs/ocfs2/heartbeat.c | |
| parent | x86: Clean up the hypervisor layer (diff) | |
| parent | Linux 2.6.34-rc6 (diff) | |
| download | linux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz linux-d7be0ce6afb1df60bc786f57410407ceae92b994.zip | |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'fs/ocfs2/heartbeat.c')
| -rw-r--r-- | fs/ocfs2/heartbeat.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/heartbeat.c b/fs/ocfs2/heartbeat.c index c6e7213db868..1aa863dd901f 100644 --- a/fs/ocfs2/heartbeat.c +++ b/fs/ocfs2/heartbeat.c @@ -26,7 +26,6 @@ #include <linux/fs.h> #include <linux/types.h> -#include <linux/slab.h> #include <linux/highmem.h> #define MLOG_MASK_PREFIX ML_SUPER |