diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-02 10:10:07 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-02 10:10:07 +0300 |
| commit | 77e5517cb506c5b1e0a91bf4774cc95452659d77 (patch) | |
| tree | e057ab71829a12ded68d9d22e661f0e391b5ad6b /scripts/checkversion.pl | |
| parent | a3d8c0d13bdedf84fe74259f6949b2cdffd80e55 (diff) | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| download | linux-77e5517cb506c5b1e0a91bf4774cc95452659d77.tar.xz | |
Merge branch 'linus' into x86/cpu, to resolve conflicts
Conflicts:
tools/power/x86/turbostat/turbostat.c
Recent turbostat changes conflicted with a pending rename of x86 model names in tip:x86/cpu,
sort it out.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/checkversion.pl')
0 files changed, 0 insertions, 0 deletions