---

yaml --- r: 88185 b: refs/heads/master c: 4cac04d h: refs/heads/master i: 88183: b357cbf v: v3
git-mirror · Apr 7, 2008 · a7fbb3e · a7fbb3e
1 parent 22e2a08
commit a7fbb3e
Show file tree

Hide file tree

Showing 86 changed files with 6,480 additions and 5,136 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfe87dbc7b4da5b05a1a78480e996787a500cc6f
+refs/heads/master: 4cac04dd63fa3b202ee313ed1afbbd135ab887ee
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -375,6 +375,10 @@ and is between 256 and 4096 characters. It is defined in the file
 	ccw_timeout_log [S390]
 			See Documentation/s390/CommonIO for details.
 
+	cgroup_disable= [KNL] Disable a particular controller
+			Format: {name of the controller(s) to disable}
+				{Currently supported controllers - "memory"}
+
 	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
 			Format: { "0" | "1" }
 			See security/selinux/Kconfig help text.

diff --git a/trunk/arch/m68k/Makefile b/trunk/arch/m68k/Makefile
@@ -13,6 +13,8 @@
 # Copyright (C) 1994 by Hamish Macdonald
 #
 
+KBUILD_DEFCONFIG := amiga_defconfig
+
 # override top level makefile
 AS += -m68020
 LDFLAGS := -m m68kelf