diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-08 03:06:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-08 04:18:47 -0400 |
| commit | c1ab9cab75098924fa8226a8a371de66977439df (patch) | |
| tree | 767e77302ca8f2eb781c60624bc8518cd50ba6eb /fs/notify/inode_mark.c | |
| parent | ff0ff84a0767df48d728c36510365344a7e7d582 (diff) | |
| parent | f5284e7635787224dda1a2bf82a4c56b1c75671f (diff) | |
Merge branch 'linus' into tracing/core
Conflicts:
include/linux/module.h
kernel/module.c
Semantic conflict:
include/trace/events/module.h
Merge reason: Resolve the conflict with upstream commit 5fbfb18 ("Fix up
possibly racy module refcounting")
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/notify/inode_mark.c')
| -rw-r--r-- | fs/notify/inode_mark.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/notify/inode_mark.c b/fs/notify/inode_mark.c index 3165d85aada2..0399bcbe09c8 100644 --- a/fs/notify/inode_mark.c +++ b/fs/notify/inode_mark.c | |||
| @@ -87,7 +87,6 @@ | |||
| 87 | #include <linux/kernel.h> | 87 | #include <linux/kernel.h> |
| 88 | #include <linux/module.h> | 88 | #include <linux/module.h> |
| 89 | #include <linux/mutex.h> | 89 | #include <linux/mutex.h> |
| 90 | #include <linux/slab.h> | ||
| 91 | #include <linux/spinlock.h> | 90 | #include <linux/spinlock.h> |
| 92 | #include <linux/writeback.h> /* for inode_lock */ | 91 | #include <linux/writeback.h> /* for inode_lock */ |
| 93 | 92 | ||