diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-10-16 13:04:34 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-10-16 13:04:34 +0200 |
| commit | 4d69f155d58d0f75c5404ea502178b1943a04755 (patch) | |
| tree | fe5b7608f05f6951fce748ea1e93d942b52902bd /tools/perf/scripts/python/export-to-postgresql.py | |
| parent | x86/fpu: Split old_fpu & new_fpu handling into separate functions (diff) | |
| parent | Linux 4.9-rc1 (diff) | |
| download | linux-dev-4d69f155d58d0f75c5404ea502178b1943a04755.tar.xz linux-dev-4d69f155d58d0f75c5404ea502178b1943a04755.zip | |
Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions