[PATCH] Update contact info for James Morris

author James Morris <jmorris@redhat.com>

Mon, 8 Aug 2005 14:29:08 +0000 (10:29 -0400)

committer Linus Torvalds <torvalds@g5.osdl.org>

Mon, 8 Aug 2005 18:46:25 +0000 (11:46 -0700)
author James Morris <jmorris@redhat.com>
Mon, 8 Aug 2005 14:29:08 +0000 (10:29 -0400)
committer Linus Torvalds <torvalds@g5.osdl.org>
Mon, 8 Aug 2005 18:46:25 +0000 (11:46 -0700)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
author	James Morris <jmorris@redhat.com>
	Mon, 8 Aug 2005 14:29:08 +0000 (10:29 -0400)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Mon, 8 Aug 2005 18:46:25 +0000 (11:46 -0700)
CREDITS		patch \| blob \| history
MAINTAINERS		patch \| blob \| history