projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 76695af decd275)
Merge branch 'x86/asm' into locking/core
authorIngo Molnar <mingo@kernel.org>
Mon, 3 Aug 2015 09:04:00 +0000 (11:04 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 3 Aug 2015 09:04:00 +0000 (11:04 +0200)
commitf320ead76a87a9c533f681ecce3bf3241d07c47d
tree76ae437119088b180737670cb99a307e163a1ca0tree | snapshot (tar.gz zip)
parent76695af20c015206cffb84b15912be6797d0cca2commit | diff
parentdecd275e62d5eef4b947fab89652fa6afdadf2f2commit | diff
Merge branch 'x86/asm' into locking/core

Upcoming changes to static keys is interacting/conflicting with the following
pending TSC commits in tip:x86/asm:

  4ea1636b04db x86/asm/tsc: Rename native_read_tsc() to rdtsc()
  ...

So merge it into the locking tree to have a smoother resolution.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/include/asm/barrier.h diff1 | diff2 | blob | history
drivers/cpufreq/intel_pstate.c diff1 | diff2 | blob | history