---

yaml --- r: 88174 b: refs/heads/master c: af26818 h: refs/heads/master v: v3
git-mirror · Apr 3, 2008 · 01a11dc · 01a11dc
1 parent 5a2026e
commit 01a11dc
Show file tree

Hide file tree

Showing 88 changed files with 5,161 additions and 6,501 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1c287b992d30dab86f1b1bfe1780d9d3a652b34
+refs/heads/master: af2681828af5f2b42e12e8b16ba0cf113cf486c8
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -375,10 +375,6 @@ 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,8 +13,6 @@
 # Copyright (C) 1994 by Hamish Macdonald
 #
 
-KBUILD_DEFCONFIG := amiga_defconfig
-
 # override top level makefile
 AS += -m68020
 LDFLAGS := -m m68kelf