diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-12 07:48:57 -0500 |
| commit | 45ab6b0c76d0e4cce5bd608ccf97b0f6b20f18df (patch) | |
| tree | 4d51c73533c386aee16fde1e74b5e3bc22eedc53 /MAINTAINERS | |
| parent | 81444a799550214f549caf579cf65a0ca55e70b7 (diff) | |
| parent | d65bd5ecb2bd166cea4952a59b7e16cc3ad6ef6c (diff) | |
Merge branch 'sched/core' into cpus4096
Conflicts:
include/linux/ftrace.h
kernel/sched.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 8f2b67ea0549..24741de12a39 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3759,6 +3759,15 @@ M: drzeus-sdhci@drzeus.cx | |||
| 3759 | L: sdhci-devel@list.drzeus.cx | 3759 | L: sdhci-devel@list.drzeus.cx |
| 3760 | S: Maintained | 3760 | S: Maintained |
| 3761 | 3761 | ||
| 3762 | SECURITY SUBSYSTEM | ||
| 3763 | F: security/ | ||
| 3764 | P: James Morris | ||
| 3765 | M: jmorris@namei.org | ||
| 3766 | L: linux-kernel@vger.kernel.org | ||
| 3767 | L: linux-security-module@vger.kernel.org (suggested Cc:) | ||
| 3768 | T: git kernel.org:pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git | ||
| 3769 | S: Supported | ||
| 3770 | |||
| 3762 | SECURITY CONTACT | 3771 | SECURITY CONTACT |
| 3763 | P: Security Officers | 3772 | P: Security Officers |
| 3764 | M: security@kernel.org | 3773 | M: security@kernel.org |