diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-08-03 09:04:00 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-08-03 09:04:00 (GMT) |
commit | f320ead76a87a9c533f681ecce3bf3241d07c47d (patch) | |
tree | 76ae437119088b180737670cb99a307e163a1ca0 /arch/sparc | |
parent | 76695af20c015206cffb84b15912be6797d0cca2 (diff) | |
parent | decd275e62d5eef4b947fab89652fa6afdadf2f2 (diff) | |
download | linux-f320ead76a87a9c533f681ecce3bf3241d07c47d.tar.xz |
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>
Diffstat (limited to 'arch/sparc')
0 files changed, 0 insertions, 0 deletions