git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6b7e265
512255a
)
Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixes
author
Ingo Molnar
<mingo@kernel.org>
Tue, 18 Aug 2015 07:39:47 +0000
(09:39 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Tue, 18 Aug 2015 07:39:47 +0000
(09:39 +0200)
Conflicts:
arch/x86/entry/entry_64_compat.S
arch/x86/math-emu/get_address.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff