Ingo Molnar f320ead76a 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:

  4ea1636b04 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>

2015-08-03 11:04:00 +02:00

2.3 KiB

Raw Blame History

View Raw