diff --git a/[refs] b/[refs]
index 407a26b5743c..a889141dee85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 118e1ef6fabfc023126e6075f6ac0fc729cb5285
+refs/heads/master: edf2e2811efa9304ebe14f778d33b764cfd58b7a
diff --git a/trunk/Documentation/filesystems/squashfs.txt b/trunk/Documentation/filesystems/squashfs.txt
index 3e79e4a7a392..b324c033035a 100644
--- a/trunk/Documentation/filesystems/squashfs.txt
+++ b/trunk/Documentation/filesystems/squashfs.txt
@@ -22,7 +22,7 @@ Squashfs filesystem features versus Cramfs:
 
 				Squashfs		Cramfs
 
-Max filesystem size:		2^64			16 MiB
+Max filesystem size:		2^64			256 MiB
 Max file size:			~ 2 TiB			16 MiB
 Max files:			unlimited		unlimited
 Max directories:		unlimited		unlimited