diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-06 19:48:59 -0400 |
| commit | fff34b3412b9401a76ba9d021db1bd91cb0e02b6 (patch) | |
| tree | 870ed2d1555004e7939d15b5099017aae61c97b8 /include/linux/writeback.h | |
| parent | 28e1e58fb668e262648fb8ee8a24154633f40507 (diff) | |
| parent | 636802ef96eebe279b22ad9f9dacfe29291e45c7 (diff) | |
Merge branch 'merge' into next
Brings in various bug fixes from 3.6-rcX
Diffstat (limited to 'include/linux/writeback.h')
| -rw-r--r-- | include/linux/writeback.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/writeback.h b/include/linux/writeback.h index c66fe3332d83..50c3e8fa06a8 100644 --- a/include/linux/writeback.h +++ b/include/linux/writeback.h | |||
| @@ -104,7 +104,6 @@ static inline void wait_on_inode(struct inode *inode) | |||
| 104 | wait_on_bit(&inode->i_state, __I_NEW, inode_wait, TASK_UNINTERRUPTIBLE); | 104 | wait_on_bit(&inode->i_state, __I_NEW, inode_wait, TASK_UNINTERRUPTIBLE); |
| 105 | } | 105 | } |
| 106 | 106 | ||
| 107 | |||
| 108 | /* | 107 | /* |
| 109 | * mm/page-writeback.c | 108 | * mm/page-writeback.c |
| 110 | */ | 109 | */ |