git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
76695af
decd275
)
Merge branch 'x86/asm' into locking/core
author
Ingo Molnar
<mingo@kernel.org>
Mon, 3 Aug 2015 09:04:00 +0000
(11:04 +0200)
committer
Ingo 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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff