summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-14 11:37:46 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-14 11:37:46 +0200
commitd59fdcf2ac501de99c3dfb452af5e254d4342886 (patch)
treead5e2efd6f8aacf2a08b1ed8a54ddf96642e83f3 /MAINTAINERS
parent2387ce57a8167490d3b34a7e1ffa9a64a1a76244 (diff)
parentbce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff)
downloadlinux-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.gz
linux-d59fdcf2ac501de99c3dfb452af5e254d4342886.tar.bz2
linux-d59fdcf2ac501de99c3dfb452af5e254d4342886.zip
Merge commit 'v2.6.26' into x86/core
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index c94d038cea33..1528e58b5408 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3088,8 +3088,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