From 4c625c21e3e90064ec1efdf9a987ad6cbd1ea475 Mon Sep 17 00:00:00 2001
From: James Morris <jmorris@redhat.com>
Date: Wed, 22 Jun 2005 12:55:42 -0400
Subject: [PATCH] --- yaml --- r: 2667 b: refs/heads/master c:
 94eb7f4cefaf3ed8e97504ce4f3946bdb908e501 h: refs/heads/master i:   2665:
 1946a5c0b0f664854f1837f24f58f94f89c58948   2663:
 9c9d28f8b144164a80db46d83c05d502c40f14d1 v: v3

---
 [refs]        | 2 +-
 trunk/CREDITS | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b9f164aa2393..3ce91c633db2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b53542073927878b18d642f6bf794adef6d45a18
+refs/heads/master: 94eb7f4cefaf3ed8e97504ce4f3946bdb908e501
diff --git a/trunk/CREDITS b/trunk/CREDITS
index 2993348ce6ce..3b7a1548aaf9 100644
--- a/trunk/CREDITS
+++ b/trunk/CREDITS
@@ -2380,9 +2380,10 @@ E: tmolina@cablespeed.com
 D: bug fixes, documentation, minor hackery
 
 N: James Morris
-E: jmorris@intercode.com.au
+E: jmorris@redhat.com
 W: http://www.intercode.com.au/jmorris/
-D: Netfilter, Linux Security Modules (LSM).
+D: Netfilter, Linux Security Modules (LSM), SELinux, IPSec,
+D: Crypto API, general networking, miscellaneous.
 S: PO Box 707
 S: Spit Junction NSW 2088
 S: Australia