Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index de9ae337de123edc328b2cfbee9c8e98681527e6..f9961cec3ab7cbdc6a4199237e8031360a29d316 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3082,8 +3082,8 @@ L:        linux-scsi@vger.kernel.org
 S:     Maintained
 
 OPROFILE
-P:     Philippe Elie
-M:     phil.el@wanadoo.fr
+P:     Robert Richter
+M:     robert.richter@amd.com
 L:     oprofile-list@lists.sf.net
 S:     Maintained