git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d3bd058
387c31c
)
Merge commit 'v2.6.37-rc8' into x86/apic
author
Ingo Molnar
<mingo@elte.hu>
Tue, 4 Jan 2011 08:43:42 +0000
(09:43 +0100)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 4 Jan 2011 08:43:42 +0000
(09:43 +0100)
Conflicts:
arch/x86/include/asm/io_apic.h
Merge reason: move to a fresh -rc, resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff