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