From: Alex Shi <alex.shi@linaro.org>
Date: Tue, 29 Nov 2016 08:06:48 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
X-Git-Tag: firefly_0821_release~176^2~87
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c39fa164766e4ead0594e8b6fd382b57fd9d5a1f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
---

c39fa164766e4ead0594e8b6fd382b57fd9d5a1f
diff --cc include/uapi/linux/magic.h
index cfb5c406f344,b283d56c1db9..d588107c9dce
--- a/include/uapi/linux/magic.h
+++ b/include/uapi/linux/magic.h
@@@ -52,10 -52,9 +52,11 @@@
  #define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
  #define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"
  
 +#define SDCARDFS_SUPER_MAGIC	0xb550ca10
 +
  #define SMB_SUPER_MAGIC		0x517B
  #define CGROUP_SUPER_MAGIC	0x27e0eb
+ #define CGROUP2_SUPER_MAGIC	0x63677270
  
  
  #define STACK_END_MAGIC		0x57AC6E9D