Please pull.
The following changes since commit e99cfa2d0634881b8a41d56c48b5956b9a3ba162:
Merge tag 'dt-fixes-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux (2014-06-17 14:25:09 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus
James Morris (1):
security: add Serge Hallyn as a maintainer
MAINTAINERS | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
commit 70b4a2598c4d88842c083eff7e28e8cc287bab5b
Author: James Morris <[email protected]>
Date: Wed Jun 18 18:57:50 2014 +1000
security: add Serge Hallyn as a maintainer
Add Serge E. Hallyn <[email protected]> as a co-maintainer of the
security subsystem, to avoid having a single point of failure
in the development process.
Signed-off-by: James Morris <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 134483f..e36d18d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7948,6 +7948,7 @@ F: drivers/mmc/host/sdhci-spear.c
SECURITY SUBSYSTEM
M: James Morris <[email protected]>
+M: Serge E. Hallyn <[email protected]>
L: [email protected] (suggested Cc:)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
W: http://kernsec.org/