git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62fdac5
512626a
)
Merge branch 'linus' into x86/mce3
author
Ingo Molnar
<mingo@elte.hu>
Thu, 11 Jun 2009 21:31:52 +0000
(23:31 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Thu, 11 Jun 2009 21:31:52 +0000
(23:31 +0200)
Conflicts:
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/irq.c
Merge reason: Resolve the conflicts above.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff