projects / platform / kernel / linux-exynos.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>
1  2 
arch/x86/include/asm/barrier.h patch | diff1 | diff2 | blob | history
drivers/cpufreq/intel_pstate.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/include/asm/barrier.h
Simple merge
diff --cc drivers/cpufreq/intel_pstate.c
Simple merge
Domain: System / Kernel;