2.6.25-rc6-git7

diff --git a/MAINTAINERS b/MAINTAINERS
index 6d628fb..73883b8 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
@@ -880,7 +880,7 @@ P:   Marcel Holtmann
 M:   marcel@holtmann.org
 P:   Maxim Krasnyansky
 M:   maxk@qualcomm.com
-L:   bluez-devel@lists.sf.net
+L:   linux-bluetooth@vger.kernel.org
 W:   http://bluez.sf.net
 W:   http://www.bluez.org
 W:   http://www.holtmann.org/linux/bluetooth/
@@ -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