tree 7cf552c623cb0aa0dd945df55b7eaf5a0697e277
parent 38736072d45488fd45f076388b6570419bbbc682
parent ee4c24a5c9b530481394132c8dbc10572d57c075
author H. Peter Anvin <hpa@zytor.com> 1243894382 -0700
committer H. Peter Anvin <hpa@zytor.com> 1243895131 -0700

Merge branch 'irq/numa' into x86/mce3

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>