Merge branch 'nsfs' into for-next

This commit is contained in:
Al Viro 2014-12-10 21:31:59 -05:00
commit 707c5960f1
27 changed files with 353 additions and 297 deletions

View file

@ -72,5 +72,6 @@
#define MTD_INODE_FS_MAGIC 0x11307854
#define ANON_INODE_FS_MAGIC 0x09041934
#define BTRFS_TEST_MAGIC 0x73727279
#define NSFS_MAGIC 0x6e736673
#endif /* __LINUX_MAGIC_H__ */