---

yaml --- r: 119771 b: refs/heads/master c: cdf0c7d h: refs/heads/master i: 119769: 2e2fb63 119767: 4490538 v: v3
git-mirror · Dec 9, 2008 · 097be46 · 097be46
1 parent 42607a0
commit 097be46
Show file tree

Hide file tree

Showing 81 changed files with 2,211 additions and 1,307 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab44f4627e2160cddbddbe8aa8b1d2b2e1559790
+refs/heads/master: cdf0c7de29a87cc600ef367893523ea15938da4e
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