git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3873607 ee4c24a)
Merge branch 'irq/numa' into x86/mce3
authorH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 22:13:02 +0000 (15:13 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 1 Jun 2009 22:25:31 +0000 (15:25 -0700)
Merge reason: arch/x86/kernel/irqinit_{32,64}.c unified in irq/numa
and modified in x86/mce3; this merge resolves the conflict.

Conflicts:
arch/x86/kernel/irqinit.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

Trivial merge
Pandora Kernel Repository