git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d7b605
6e86841
)
Merge commit 'v2.6.27-rc1' into x86/microcode
author
Ingo Molnar
<mingo@elte.hu>
Tue, 29 Jul 2008 09:54:24 +0000
(11:54 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Tue, 29 Jul 2008 09:54:24 +0000
(11:54 +0200)
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff