aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS10
1 files changed, 6 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f148fa6f4ec7..f1ed75cef6a4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -452,7 +452,7 @@ S: Maintained
452 452
453ARM/ATMEL AT91RM9200 ARM ARCHITECTURE 453ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
454P: Andrew Victor 454P: Andrew Victor
455M: andrew@sanpeople.com 455M: linux@maxim.org.za
456L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) 456L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
457W: http://maxim.org.za/at91_26.html 457W: http://maxim.org.za/at91_26.html
458S: Maintained 458S: Maintained
@@ -2322,6 +2322,8 @@ P: Anil S Keshavamurthy
2322M: anil.s.keshavamurthy@intel.com 2322M: anil.s.keshavamurthy@intel.com
2323P: David S. Miller 2323P: David S. Miller
2324M: davem@davemloft.net 2324M: davem@davemloft.net
2325P: Masami Hiramatsu
2326M: mhiramat@redhat.com
2325L: linux-kernel@vger.kernel.org 2327L: linux-kernel@vger.kernel.org
2326S: Maintained 2328S: Maintained
2327 2329
@@ -2935,9 +2937,9 @@ S: Maintained
2935 2937
2936ORACLE CLUSTER FILESYSTEM 2 (OCFS2) 2938ORACLE CLUSTER FILESYSTEM 2 (OCFS2)
2937P: Mark Fasheh 2939P: Mark Fasheh
2938M: mark.fasheh@oracle.com 2940M: mfasheh@suse.com
2939P: Kurt Hackel 2941P: Joel Becker
2940M: kurt.hackel@oracle.com 2942M: joel.becker@oracle.com
2941L: ocfs2-devel@oss.oracle.com 2943L: ocfs2-devel@oss.oracle.com
2942W: http://oss.oracle.com/projects/ocfs2/ 2944W: http://oss.oracle.com/projects/ocfs2/
2943S: Supported 2945S: Supported