diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /fs/ocfs2/cluster/quorum.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/ocfs2/cluster/quorum.c')
| -rw-r--r-- | fs/ocfs2/cluster/quorum.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/quorum.c b/fs/ocfs2/cluster/quorum.c index 639024033fce..cf3e16696216 100644 --- a/fs/ocfs2/cluster/quorum.c +++ b/fs/ocfs2/cluster/quorum.c | |||
| @@ -44,7 +44,6 @@ | |||
| 44 | * and if they're the last, they fire off the decision. | 44 | * and if they're the last, they fire off the decision. |
| 45 | */ | 45 | */ |
| 46 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| 47 | #include <linux/slab.h> | ||
| 48 | #include <linux/workqueue.h> | 47 | #include <linux/workqueue.h> |
| 49 | #include <linux/reboot.h> | 48 | #include <linux/reboot.h> |
| 50 | 49 | ||