diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-16 09:19:56 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-16 09:19:56 +0200 |
| commit | d71b0ad8d30922ccdd0705318237e6890b4ec1b6 (patch) | |
| tree | 347c773357c1afc87d65f767258317164bc0e31e /drivers/infiniband/hw/ehca/ehca_main.c | |
| parent | a4d71093e759b7cfe0babbc6ae89c8130532f6ad (diff) | |
| parent | f6cf87f748ff9480f97ff9c5caf6d6faacf52aa1 (diff) | |
| download | linux-d71b0ad8d30922ccdd0705318237e6890b4ec1b6.tar.bz2 | |
Merge branch 'perf/urgent' into perf/core, to resolve a conflict
Conflicts:
tools/perf/ui/browsers/hists.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/infiniband/hw/ehca/ehca_main.c')
0 files changed, 0 insertions, 0 deletions