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

diff --cc include/uapi/linux/magic.h
index cfb5c406f34466b487ffaf5bff4d8b5bd6f172ec,b283d56c1db97955f0558776fdc98e03294b7ce0..d588107c9dcee80c2ca7a31cc9eef916933e01ef
--- 1/include/uapi/linux/magic.h
--- 2/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

diff --cc kernel/cgroup.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge