diff --git a/[refs] b/[refs]
index 614c5cc04bbd..427254b156ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13114716c744afe165c2148c944ed0306658921c
+refs/heads/master: fad02c2de0623fc6d4ff12ca72b60ea521118681
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index b7b230606f2c..1118e02a40b6 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -4043,9 +4043,9 @@ enum {
 	MCS_CACHE,
 	MCS_RSS,
 	MCS_FILE_MAPPED,
+	MCS_SWAP,
 	MCS_PGPGIN,
 	MCS_PGPGOUT,
-	MCS_SWAP,
 	MCS_PGFAULT,
 	MCS_PGMAJFAULT,
 	MCS_INACTIVE_ANON,
@@ -4064,9 +4064,9 @@ static const char *memcg_stat_strings[NR_MCS_STAT] = {
 	"cache",
 	"rss",
 	"mapped_file",
+	"swap",
 	"pgpgin",
 	"pgpgout",
-	"swap",
 	"pgfault",
 	"pgmajfault",
 	"inactive_anon",