diff --git a/[refs] b/[refs]
index 70aaf7f1ef28..d726cec47979 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7b7cad0d8df823ea063c86a54316bbcbfa04a7c
+refs/heads/master: 152bce6bdd6e6866ff83166ac75177d001c4360d
diff --git a/trunk/drivers/staging/zram/zram_drv.c b/trunk/drivers/staging/zram/zram_drv.c
index 85055c4fc2f2..3318b0ff8f4d 100644
--- a/trunk/drivers/staging/zram/zram_drv.c
+++ b/trunk/drivers/staging/zram/zram_drv.c
@@ -519,7 +519,7 @@ int zram_init_device(struct zram *zram)
 		"ratio. Note that zram uses about 0.1%% of the size of "
 		"the disk when not in use so a huge zram is "
 		"wasteful.\n"
-		"\tMemory Size: %zu kB\n"
+		"\tMemory Size: %lu kB\n"
 		"\tSize you selected: %llu kB\n"
 		"Continuing anyway ...\n",
 		(totalram_pages << PAGE_SHIFT) >> 10, zram->disksize >> 10