Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / include / linux / magic.h

diff --git a/include/linux/magic.h b/include/linux/magic.h
index 36cc20d..1fa0c2c 100644 (file)
--- a/include/linux/magic.h
+++ b/include/linux/magic.h
@@ -37,5 +37,9 @@
 
 #define SMB_SUPER_MAGIC                0x517B
 #define USBDEVICE_SUPER_MAGIC  0x9fa2
+#define CGROUP_SUPER_MAGIC     0x27e0eb
+
+#define FUTEXFS_SUPER_MAGIC    0xBAD1DEA
+#define INOTIFYFS_SUPER_MAGIC  0x2BAD1DEA
 
 #endif /* __LINUX_MAGIC_H__ */