lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into stackprotector

Browse Source 
Conflicts:
	arch/x86/kernel/Makefile
	include/asm-x86/pda.h
This commit is contained in:
Ingo Molnar
2008-10-15 13:46:29 +02:00
parent 4f962d4d65 278429cff8
commit b2aaf8f74c
15391 changed files with 1154074 additions and 777808 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/magic.h
View File

@@ -6,6 +6,10 @@
#define AFS_SUPER_MAGIC 0x5346414F
#define AUTOFS_SUPER_MAGIC 0x0187
#define CODA_SUPER_MAGIC 0x73757245
#define DEBUGFS_MAGIC 0x64626720
#define SYSFS_MAGIC 0x62656572
#define SECURITYFS_MAGIC 0x73636673
#define TMPFS_MAGIC 0x01021994
#define EFS_SUPER_MAGIC 0x414A53
#define EXT2_SUPER_MAGIC 0xEF53
#define EXT3_SUPER_MAGIC 0xEF53