| commit | f7dc7fd1c08c6d8109688694fd93d80645df89ff | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Mon May 11 11:56:27 2015 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Mon May 11 11:56:27 2015 +0200 |
| tree | 255e1e24bcf089d584e45ea8a733883c1bb4d74c | |
| parent | 32b0ed3ae66cd6114f8510161f833f05518c0395 [diff] | |
| parent | 44b11fee51711ca85aa2b121a49bf029d18a3722 [diff] |
Merge branch 'perf/urgent' into perf/core, to resolve conflicts Conflicts: tools/perf/builtin-kmem.c Signed-off-by: Ingo Molnar <mingo@kernel.org>