Skip to content

GitLab

Commit bd41229e authored by J. R. Okajima's avatar J. R. Okajima
Browse files

Merge branch 'aufs5.2.5+/00base' into aufs5.2.5+/01modular

parents 072b2d90 454059f2
Show whitespace changes
Inline Side-by-side
include/uapi/linux/aufs_type.h
View file @ bd41229e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <linux/limits.h> #include <linux/limits.h>
#define AUFS_VERSION "5.2" #define AUFS_VERSION "5.2.5+"
/* todo? move this to linux-2.6.19/include/magic.h */ /* todo? move this to linux-2.6.19/include/magic.h */
#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') #define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment