git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d48daf3
7eb9ae0
)
Merge branch 'x86/apic' into x86/platform
author
Ingo Molnar
<mingo@kernel.org>
Mon, 18 Jun 2012 09:09:49 +0000
(11:09 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Mon, 18 Jun 2012 09:09:49 +0000
(11:09 +0200)
Merge in x86/apic to solve a vector_allocation_domain() API change semantic merge conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Trivial merge