diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-04-14 16:45:39 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-04-14 16:45:39 +0200 |
commit | fbdd17ec5ce2e5e4027356fcfde769b88d15702f (patch) | |
tree | d655577d9bb40b7c9a03d35b513fd9a1bbfe431d /scripts/kernel-doc | |
parent | 740c699a8d316c8bf8593f19e2ca47795e690622 (diff) | |
parent | 90f6bb6c98ffef42125d7be6d4612505f561fbce (diff) | |
download | blackbird-obmc-linux-fbdd17ec5ce2e5e4027356fcfde769b88d15702f.tar.gz blackbird-obmc-linux-fbdd17ec5ce2e5e4027356fcfde769b88d15702f.zip |
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 'scripts/kernel-doc')
0 files changed, 0 insertions, 0 deletions