git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0aa002f
cb600d2
)
Merge branch 'linus' into x86/apic-cleanups
author
Ingo Molnar
<mingo@elte.hu>
Fri, 7 Jan 2011 13:14:15 +0000
(14:14 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 7 Jan 2011 13:14:15 +0000
(14:14 +0100)
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: Resolve the conflict, update to a more recent -rc base
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff