projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c0fee0 b1c599b)
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2015 16:41:03 +0000 (09:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 1 Sep 2015 16:41:03 +0000 (09:41 -0700)
Pull x86 cpu updates from Ingo Molnar:
 "Two changes: a suspend/resume quirk and a new CPUID bit definition"

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpufeature: Add feature bit for Intel's Silicon Debug CPUID bit
  x86/cpu: Restore MSR_IA32_ENERGY_PERF_BIAS after resume

1  2 
arch/x86/include/asm/cpufeature.h patch | diff1 | diff2 | blob | history
arch/x86/kernel/cpu/common.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/cpufeature.h
Simple merge
diff --cc arch/x86/kernel/cpu/common.c
Simple merge