---

yaml --- r: 119748 b: refs/heads/master c: d5654ef h: refs/heads/master v: v3
git-mirror · Dec 3, 2008 · 5e512db · 5e512db
1 parent 4077a79
commit 5e512db
Show file tree

Hide file tree

Showing 75 changed files with 1,287 additions and 2,089 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f84b4dbe92e3ffb00f4d8cbe9a31b5be5ecd8ca
+refs/heads/master: d5654efd3ff1cd0baa935a0c9a5d89862f07d009
diff --git a/trunk/Documentation/local_ops.txt b/trunk/Documentation/local_ops.txt
@@ -149,7 +149,7 @@ static void do_test_timer(unsigned long data)
 	int cpu;
 
 	/* Increment the counters */
-	on_each_cpu(test_each, NULL, 1);
+	on_each_cpu(test_each, NULL, 0, 1);
 	/* Read all the counters */
 	printk("Counters read from CPU %d\n", smp_processor_id());
 	for_each_online_cpu(cpu) {

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -3759,15 +3759,6 @@ M:	drzeus-sdhci@drzeus.cx
 L:	sdhci-devel@list.drzeus.cx
 S:	Maintained
 
-SECURITY SUBSYSTEM
-F:	security/
-P:	James Morris
-M:	jmorris@namei.org
-L:	linux-kernel@vger.kernel.org
-L:	linux-security-module@vger.kernel.org (suggested Cc:)
-T:	git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
-S:	Supported
-
 SECURITY CONTACT
 P:	Security Officers
 M:	security@kernel.org