From c5215f32ac6cc3d2ec0ca844a171cdcf4c0bab62 Mon Sep 17 00:00:00 2001 From: Andrew Victor Date: Wed, 12 Mar 2008 21:29:09 +0100 Subject: [ARM] 4861/1: AT91: Update maintainer email address (again) Change email address of AT91 maintainer. This reverts the incorrect change in commit 6650e0a517bbfa1c47aa3da6b3562fcb1a066c63 Signed-off-by: Andrew Victor Signed-off-by: Russell King --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 6d628fb6ee0..d8ec68df64e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -452,7 +452,7 @@ S: Maintained ARM/ATMEL AT91RM9200 ARM ARCHITECTURE P: Andrew Victor -M: andrew@sanpeople.com +M: linux@maxim.org.za L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) W: http://maxim.org.za/at91_26.html S: Maintained -- cgit v1.2.3 From a57543376c99e4d074516c5bf23c7ddc1dc613a0 Mon Sep 17 00:00:00 2001 From: Mark Fasheh Date: Fri, 21 Mar 2008 10:40:31 -0700 Subject: ocfs2: MAINTAINERS update Change my e-mail address, add Joel as new co-maintainer. Signed-off-by: Mark Fasheh --- MAINTAINERS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 03e4602e1b9..73883b8bbd7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2935,9 +2935,9 @@ S: Maintained ORACLE CLUSTER FILESYSTEM 2 (OCFS2) P: Mark Fasheh -M: mark.fasheh@oracle.com -P: Kurt Hackel -M: kurt.hackel@oracle.com +M: mfasheh@suse.com +P: Joel Becker +M: joel.becker@oracle.com L: ocfs2-devel@oss.oracle.com W: http://oss.oracle.com/projects/ocfs2/ S: Supported -- cgit v1.2.3 From 6edef97e17ca1c322b146023862da8a39e36204d Mon Sep 17 00:00:00 2001 From: Masami Hiramatsu Date: Wed, 26 Mar 2008 15:53:19 -0400 Subject: kprobes: MAINTAINERS update Add Masami Hiramatsu to kprobes maintainers Signed-off-by: Masami Hiramatsu Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 73883b8bbd7..2f70e5c10ae 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2322,6 +2322,8 @@ P: Anil S Keshavamurthy M: anil.s.keshavamurthy@intel.com P: David S. Miller M: davem@davemloft.net +P: Masami Hiramatsu +M: mhiramat@redhat.com L: linux-kernel@vger.kernel.org S: Maintained -- cgit v1.2.3 From fac533c2505b39faf30492cd3f0844c0da51c75c Mon Sep 17 00:00:00 2001 From: David Howells Date: Fri, 28 Mar 2008 14:15:54 -0700 Subject: afs: add a MAINTAINERS record for AFS Add a MAINTAINERS record for AFS. Signed-off-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index f1ed75cef6a..38659ac92e0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -163,6 +163,12 @@ M: A2232@gmx.net L: linux-m68k@lists.linux-m68k.org S: Maintained +AFS FILESYSTEM & AF_RXRPC SOCKET DOMAIN +P: David Howells +M: dhowells@redhat.com +L: linux-afs@lists.infradead.org +S: Supported + AIO P: Benjamin LaHaise M: bcrl@kvack.org -- cgit v1.2.3 From ab473a52500528a276920a26cb35b722a868ab6e Mon Sep 17 00:00:00 2001 From: Ananth N Mavinakayanahalli Date: Fri, 28 Mar 2008 14:16:07 -0700 Subject: kprobes: another MAINTAINERS update Prasanna has taken a new job. Update the MAINTAINERS file Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) (limited to 'MAINTAINERS') diff --git a/MAINTAINERS b/MAINTAINERS index 38659ac92e0..90dcbbcad91 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2320,8 +2320,6 @@ L: kexec@lists.infradead.org S: Maintained KPROBES -P: Prasanna S Panchamukhi -M: prasanna@in.ibm.com P: Ananth N Mavinakayanahalli M: ananth@in.ibm.com P: Anil S Keshavamurthy -- cgit v1.2.3