]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
[IA64] Manual merge fix for 3 files
authorTony Luck <tony.luck@intel.com>
Thu, 8 Sep 2005 21:27:13 +0000 (14:27 -0700)
committerTony Luck <tony.luck@intel.com>
Thu, 8 Sep 2005 21:27:13 +0000 (14:27 -0700)
commit344a076110f4ecb16ea6d286b63be696604982ed
treedef6e229efdb6ee91b631b6695bf7f9ace8e2719
parent9b17e7e74e767d8a494a74c3c459aeecd1e08c5f
parent1b11d78cf87a7014f96e5b7fa2e1233cc8081a00
[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>
arch/ia64/Kconfig
arch/ia64/configs/sn2_defconfig
arch/ia64/configs/tiger_defconfig
arch/ia64/configs/zx1_defconfig
arch/ia64/defconfig
arch/ia64/kernel/acpi.c
arch/ia64/kernel/iosapic.c
arch/ia64/mm/fault.c
include/asm-ia64/irq.h