diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-11 11:56:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-11 11:56:27 +0200 |
| commit | f7dc7fd1c08c6d8109688694fd93d80645df89ff (patch) | |
| tree | 255e1e24bcf089d584e45ea8a733883c1bb4d74c /drivers/platform/goldfish | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | perf/x86/rapl: Enable Broadwell-U RAPL support (diff) | |
| download | linux-f7dc7fd1c08c6d8109688694fd93d80645df89ff.tar.xz linux-f7dc7fd1c08c6d8109688694fd93d80645df89ff.zip | |
Merge branch 'perf/urgent' into perf/core, to resolve conflicts
Conflicts:
tools/perf/builtin-kmem.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/platform/goldfish')
0 files changed, 0 insertions, 0 deletions