X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=MAINTAINERS;h=069ee3b5c651ff31c7237bd514aff3bb40322873;hb=b890f6b59d1210c682b310a28dabd134674b81e0;hp=1e55e1eeb811165fd0b7651eaf23286737b9dc4e;hpb=e211bc8d96d45799cab1be46f4367327d5f629ba;p=deliverable%2Flinux.git

diff --git a/MAINTAINERS b/MAINTAINERS
index 1e55e1eeb811..069ee3b5c651 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4604,7 +4604,7 @@ F:	arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
 F:	arch/arm/mach-omap2/clockdomain44xx.c
 
 OMAP AUDIO SUPPORT
-M:	Jarkko Nikula <jhnikula@gmail.com>
+M:	Jarkko Nikula <jarkko.nikula@bitmer.com>
 L:	alsa-devel@alsa-project.org (subscribers-only)
 L:	linux-omap@vger.kernel.org
 S:	Maintained
@@ -4971,7 +4971,7 @@ M:	Paul Mackerras <paulus@samba.org>
 M:	Ingo Molnar <mingo@elte.hu>
 M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
 S:	Supported
-F:	kernel/perf_event*.c
+F:	kernel/events/*
 F:	include/linux/perf_event.h
 F:	arch/*/kernel/perf_event*.c
 F:	arch/*/kernel/*/perf_event*.c