git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c8e56d2
243d657
)
Merge branch 'x86/ras' into x86/core, to fix conflicts
author
Ingo Molnar
<mingo@kernel.org>
Sun, 7 Jun 2015 13:35:27 +0000
(15:35 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Sun, 7 Jun 2015 13:35:27 +0000
(15:35 +0200)
Conflicts:
arch/x86/include/asm/irq_vectors.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff