git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f5d6a52
f21262b
)
Merge branch 'x86/asm' into x86/apic, to resolve a conflict
author
Ingo Molnar
<mingo@kernel.org>
Mon, 11 May 2015 14:05:09 +0000
(16:05 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 11 May 2015 14:05:09 +0000
(16:05 +0200)
Conflicts:
arch/x86/kernel/apic/io_apic.c
arch/x86/kernel/apic/vector.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff