Please apply. ---
diff -urN a/CREDITS b/CREDITS --- a/CREDITS 2005-08-07 14:18:56.000000000 -0400 +++ b/CREDITS 2005-08-08 10:03:56.000000000 -0400 @@ -2380,8 +2380,8 @@ D: bug fixes, documentation, minor hackery N: James Morris -E: [EMAIL PROTECTED] -W: http://www.intercode.com.au/jmorris/ +E: [EMAIL PROTECTED] +W: http://namei.org/ D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec, D: Crypto API, general networking, miscellaneous. S: PO Box 707 diff -urN a/MAINTAINERS b/MAINTAINERS --- a/MAINTAINERS 2005-08-07 14:18:56.000000000 -0400 +++ b/MAINTAINERS 2005-08-08 10:04:04.000000000 -0400 @@ -1658,7 +1658,7 @@ P: Pekka Savola (ipv6) M: [EMAIL PROTECTED] P: James Morris -M: [EMAIL PROTECTED] +M: [EMAIL PROTECTED] P: Hideaki YOSHIFUJI M: [EMAIL PROTECTED] P: Patrick McHardy @@ -2047,7 +2047,7 @@ P: Stephen Smalley M: [EMAIL PROTECTED] P: James Morris -M: [EMAIL PROTECTED] +M: [EMAIL PROTECTED] L: linux-kernel@vger.kernel.org (kernel issues) L: [EMAIL PROTECTED] (general discussion) W: http://www.nsa.gov/selinux - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
