git.samba.org / sfrench / cifs-2.6.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a3d8c0d 9f159ae)
Merge branch 'linus' into x86/cpu, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Mon, 2 Sep 2019 07:10:07 +0000 (09:10 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 2 Sep 2019 07:10:07 +0000 (09:10 +0200)
commit77e5517cb506c5b1e0a91bf4774cc95452659d77
treee057ab71829a12ded68d9d22e661f0e391b5ad6btree
parenta3d8c0d13bdedf84fe74259f6949b2cdffd80e55commit | diff
parent9f159ae07f07fc540290f21937231034f554bdd7commit | diff
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>
arch/x86/events/intel/core.c diff1 | diff2 | blob | history
arch/x86/kernel/apic/apic.c diff1 | diff2 | blob | history
tools/power/x86/turbostat/turbostat.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.