| commit | 2a3ede8cb2ddee5885518e4232aca13056f9a6e0 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon Nov 04 07:49:35 2013 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon Nov 04 07:49:35 2013 +0100 |
| tree | 79b2b4e060a97b1e7c60d58549f8c97cb15db5dd | |
| parent | 0e73453e172aaa38fd59fd4d3fc589e8fc9b9a70 [diff] | |
| parent | 215432ed30393ed4a8f77db0a1fe34523c48cdba [diff] |
Merge branch 'perf/urgent' into perf/core to fix conflicts Conflicts: tools/perf/bench/numa.c Signed-off-by: Ingo Molnar <mingo@kernel.org>