diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:51:44 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-08-18 21:51:44 +0200 |
commit | fe4c51b22080691792d3e28d86acb4d4ccb7e8e8 (patch) | |
tree | a88323ad10bb2ad6b19b5ea5fbb41a210096bd5f /MAINTAINERS | |
parent | 72ed62bdc46d76c965fb95aecb5d0bf97c976723 (diff) | |
parent | 43bece79796c2a39ec98998fd3f1071f04f3d8c3 (diff) | |
download | linux-3.10-fe4c51b22080691792d3e28d86acb4d4ccb7e8e8.tar.gz linux-3.10-fe4c51b22080691792d3e28d86acb4d4ccb7e8e8.tar.bz2 linux-3.10-fe4c51b22080691792d3e28d86acb4d4ccb7e8e8.zip |
Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1d445f57298..069ee3b5c65 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |