Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 0 deletions

diff --git a/include/linux/magic.h b/include/linux/magic.h
index eb9800f05782..1e5df2af8d84 100644
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -16,16 +16,19 @@
 #define TMPFS_MAGIC             0x01021994
 #define HUGETLBFS_MAGIC         0x958458f6      /* some random number */
 #define SQUASHFS_MAGIC          0x73717368
+#define ECRYPTFS_SUPER_MAGIC    0xf15f
 #define EFS_SUPER_MAGIC         0x414A53
 #define EXT2_SUPER_MAGIC        0xEF53
 #define EXT3_SUPER_MAGIC        0xEF53
 #define XENFS_SUPER_MAGIC       0xabba1974
 #define EXT4_SUPER_MAGIC        0xEF53
 #define BTRFS_SUPER_MAGIC       0x9123683E
+#define NILFS_SUPER_MAGIC       0x3434
 #define HPFS_SUPER_MAGIC        0xf995e849
 #define ISOFS_SUPER_MAGIC       0x9660
 #define JFFS2_SUPER_MAGIC       0x72b6
 #define ANON_INODE_FS_MAGIC     0x09041934
+#define PSTOREFS_MAGIC          0x6165676C
 
 #define MINIX_SUPER_MAGIC       0x137F          /* original minix fs */
 #define MINIX_SUPER_MAGIC2      0x138F          /* minix fs, 30 char names */
@@ -57,5 +60,6 @@
 
 #define DEVPTS_SUPER_MAGIC      0x1cd1
 #define SOCKFS_MAGIC            0x534F434B
+#define V9FS_MAGIC              0x01021997
 
 #endif /* __LINUX_MAGIC_H__ */