diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /include/linux/nilfs2_fs.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/nilfs2_fs.h')
| -rw-r--r-- | include/linux/nilfs2_fs.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/nilfs2_fs.h b/include/linux/nilfs2_fs.h index 7454ad7451b4..89bd4a4dcfb4 100644 --- a/include/linux/nilfs2_fs.h +++ b/include/linux/nilfs2_fs.h | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 42 | #include <linux/ioctl.h> | 42 | #include <linux/ioctl.h> |
| 43 | #include <linux/magic.h> | 43 | #include <linux/magic.h> |
| 44 | #include <linux/bug.h> | ||
| 44 | 45 | ||
| 45 | 46 | ||
| 46 | #define NILFS_INODE_BMAP_SIZE 7 | 47 | #define NILFS_INODE_BMAP_SIZE 7 |