diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
| commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
| tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /include/linux/magic.h | |
| parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'include/linux/magic.h')
| -rw-r--r-- | include/linux/magic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/magic.h b/include/linux/magic.h index f7f3fdddbef0..439f6f3cb0c4 100644 --- a/include/linux/magic.h +++ b/include/linux/magic.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #define EFS_SUPER_MAGIC 0x414A53 | 13 | #define EFS_SUPER_MAGIC 0x414A53 |
| 14 | #define EXT2_SUPER_MAGIC 0xEF53 | 14 | #define EXT2_SUPER_MAGIC 0xEF53 |
| 15 | #define EXT3_SUPER_MAGIC 0xEF53 | 15 | #define EXT3_SUPER_MAGIC 0xEF53 |
| 16 | #define XENFS_SUPER_MAGIC 0xabba1974 | ||
| 16 | #define EXT4_SUPER_MAGIC 0xEF53 | 17 | #define EXT4_SUPER_MAGIC 0xEF53 |
| 17 | #define HPFS_SUPER_MAGIC 0xf995e849 | 18 | #define HPFS_SUPER_MAGIC 0xf995e849 |
| 18 | #define ISOFS_SUPER_MAGIC 0x9660 | 19 | #define ISOFS_SUPER_MAGIC 0x9660 |