---

yaml --- r: 119705 b: refs/heads/master c: 0efcafb h: refs/heads/master i: 119703: 9431ac9 v: v3
git-mirror · Dec 5, 2008 · 8a37606 · 8a37606
1 parent 6e65dd1
commit 8a37606
Show file tree

Hide file tree

Showing 39 changed files with 1,521 additions and 941 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 410d2c8187ed969238ba98008c1d57307a56cfd8
+refs/heads/master: 0efcafb0fb7a163999a8821e8a5e7792fca90a2d
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, 0, 1);
+	on_each_cpu(test_each, NULL, 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,6 +3759,15 @@ 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