Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
@@ -6,6 +6,7 @@
|
||||
#define AFFS_SUPER_MAGIC 0xadff
|
||||
#define AFS_SUPER_MAGIC 0x5346414F
|
||||
#define AUTOFS_SUPER_MAGIC 0x0187
|
||||
#define CEPH_SUPER_MAGIC 0x00c36400
|
||||
#define CODA_SUPER_MAGIC 0x73757245
|
||||
#define CRAMFS_MAGIC 0x28cd3d45 /* some random number */
|
||||
#define CRAMFS_MAGIC_WEND 0x453dcd28 /* magic number with the wrong endianess */
|
||||
|
||||
Reference in New Issue
Block a user