diff --git a/[refs] b/[refs]
index 000f02a56515..d6fb992c7587 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afefdbb28a0a2af689926c30b94a14aea6036719
+refs/heads/master: 339b0c0813a257893fa84be999b9b85a50846dd8
diff --git a/trunk/arch/frv/Kconfig b/trunk/arch/frv/Kconfig
index f7b171b92ea2..cf1c446e003a 100644
--- a/trunk/arch/frv/Kconfig
+++ b/trunk/arch/frv/Kconfig
@@ -86,6 +86,14 @@ config HIGHPTE
 	  with a lot of RAM, this can be wasteful of precious low memory.
 	  Setting this option will put user-space page tables in high memory.
 
+config LARGE_ALLOCS
+	bool "Allow allocating large blocks (> 1MB) of memory"
+	help
+	  Allow the slab memory allocator to keep chains for very large memory
+	  sizes - up to 32MB. You may need this if your system has a lot of
+	  RAM, and you need to able to allocate very large contiguous chunks.
+	  If unsure, say N.
+
 source "mm/Kconfig"
 
 choice