]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dbc9f69 032735e)
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)
commitbf94085e76f442b6f0c83ec26ed93e2b7818d766
tree76ae437119088b180737670cb99a307e163a1ca0tree | snapshot
parentdbc9f6913b2b54d897b8087174249408a1efee17commit | diff
parent032735e224c08eee5eb6be603ab95a2a521de51fcommit | 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:

  deca78372bf6 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
Linux Kernel Source Tree.