Commit 344a0761 authored Sep 08, 2005 by Tony Luck

[IA64] Manual merge fix for 3 files



	arch/ia64/Kconfig
	arch/ia64/kernel/acpi.c
	include/asm-ia64/irq.h

Signed-off-by: Tony Luck <tony.luck@intel.com>

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Please register or to comment