diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:45:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-14 10:45:39 -0400 |
| commit | fbdd17ec5ce2e5e4027356fcfde769b88d15702f (patch) | |
| tree | d655577d9bb40b7c9a03d35b513fd9a1bbfe431d /MAINTAINERS | |
| parent | 740c699a8d316c8bf8593f19e2ca47795e690622 (diff) | |
| parent | 90f6bb6c98ffef42125d7be6d4612505f561fbce (diff) | |
Merge branch 'perf-core-for-mingo' into perf/urgent
Conflicts:
tools/perf/bench/numa.c
Pull perf fixes from Jiri Olsa.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6dc67b1fdb50..80399fff805d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -6782,7 +6782,7 @@ PERFORMANCE EVENTS SUBSYSTEM | |||
| 6782 | M: Peter Zijlstra <a.p.zijlstra@chello.nl> | 6782 | M: Peter Zijlstra <a.p.zijlstra@chello.nl> |
| 6783 | M: Paul Mackerras <paulus@samba.org> | 6783 | M: Paul Mackerras <paulus@samba.org> |
| 6784 | M: Ingo Molnar <mingo@redhat.com> | 6784 | M: Ingo Molnar <mingo@redhat.com> |
| 6785 | M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> | 6785 | M: Arnaldo Carvalho de Melo <acme@kernel.org> |
| 6786 | L: linux-kernel@vger.kernel.org | 6786 | L: linux-kernel@vger.kernel.org |
| 6787 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core | 6787 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core |
| 6788 | S: Supported | 6788 | S: Supported |