History

Merge branch 'nsfs' into for-next

Al Viro committed 11 years ago

Commit 707c5962 parents ba00410 3d3d35b27 files · +353 −297Browse files

Showing the changes to include/uapi/linux (1 of 27 files). Show all

Unified · Split

include/uapi/linux/magic.h+1−0
@@ -72,5 +72,6 @@ · 71 unmodified lines
72#define MTD_INODE_FS_MAGIC 0x1130785472#define MTD_INODE_FS_MAGIC 0x11307854
73#define ANON_INODE_FS_MAGIC 0x0904193473#define ANON_INODE_FS_MAGIC 0x09041934
74#define BTRFS_TEST_MAGIC 0x7372727974#define BTRFS_TEST_MAGIC 0x73727279
75#define NSFS_MAGIC 0x6e736673
75 76
76#endif /* __LINUX_MAGIC_H__ */77#endif /* __LINUX_MAGIC_H__ */