diff --git a/[refs] b/[refs]
index 0d131951cc71..fecbf21f17e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4c493a5a5c0bab6c434af2723328edd79c49aa0c
+refs/heads/master: 25f4379b8c79066c4be0e5995f37f5265733b801
diff --git a/trunk/Documentation/vm/slub.txt b/trunk/Documentation/vm/slub.txt
index f464f47bc60d..2acdda9601b0 100644
--- a/trunk/Documentation/vm/slub.txt
+++ b/trunk/Documentation/vm/slub.txt
@@ -117,7 +117,7 @@ can be influenced by kernel parameters:
 
 slub_min_objects=x		(default 4)
 slub_min_order=x		(default 0)
-slub_max_order=x		(default 1)
+slub_max_order=x		(default 3 (PAGE_ALLOC_COSTLY_ORDER))
 
 slub_min_objects allows to specify how many objects must at least fit
 into one slab in order for the allocation order to be acceptable.