diff options
| author | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-05-24 03:59:36 -0400 |
| commit | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (patch) | |
| tree | c9d7fc50a2e2147a5ca07e3096e7eeb916ad2da9 /fs/notify/mark.c | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
| parent | 6ea0c34dac89611126455537552cffe6c7e832ad (diff) | |
Merge branch 'fixes-2.6.39' into for-2.6.40
Diffstat (limited to 'fs/notify/mark.c')
| -rw-r--r-- | fs/notify/mark.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/notify/mark.c b/fs/notify/mark.c index 325185e514bb..50c00856f730 100644 --- a/fs/notify/mark.c +++ b/fs/notify/mark.c | |||
| @@ -91,7 +91,6 @@ | |||
| 91 | #include <linux/slab.h> | 91 | #include <linux/slab.h> |
| 92 | #include <linux/spinlock.h> | 92 | #include <linux/spinlock.h> |
| 93 | #include <linux/srcu.h> | 93 | #include <linux/srcu.h> |
| 94 | #include <linux/writeback.h> /* for inode_lock */ | ||
| 95 | 94 | ||
| 96 | #include <asm/atomic.h> | 95 | #include <asm/atomic.h> |
| 97 | 96 | ||