From: Ingo Molnar Date: Mon, 3 Aug 2015 09:04:00 +0000 (+0200) Subject: Merge branch 'x86/asm' into locking/core X-Git-Tag: v4.3-rc1~90^2~24 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f320ead76a87a9c533f681ecce3bf3241d07c47d;p=linux.git 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 --- f320ead76a87a9c533f681ecce3bf3241d07c47d