Please pull.
The following changes since commit 27e74da9800289e69ba907777df1e2085231eff7:
Linus Torvalds (1):
i387: export 'fpu_owner_task' per-cpu variable
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):
maintainers: update my email address
MAINTAINERS | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
commit 9b45c0d2c50e19bd73d2f5e18dd6912a6991306e
Author: James Morris <[email protected]>
Date: Wed Feb 22 12:45:07 2012 +1100
maintainers: update my email address
Update my email address.
Signed-off-by: James Morris <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 9a648eb..924fb0b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5861,7 +5861,7 @@ S: Maintained
F: drivers/mmc/host/sdhci-spear.c
SECURITY SUBSYSTEM
-M: James Morris <[email protected]>
+M: James Morris <[email protected]>
L: [email protected] (suggested Cc:)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
W: http://security.wiki.kernel.org/
@@ -5874,7 +5874,7 @@ S: Supported
SELINUX SECURITY MODULE
M: Stephen Smalley <[email protected]>
-M: James Morris <[email protected]>
+M: James Morris <[email protected]>
M: Eric Paris <[email protected]>
L: [email protected] (subscribers-only, general discussion)
W: http://selinuxproject.org