linux-stable/arch/ia64
Tony Luck 344a076110 [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>
2005-09-08 14:27:13 -07:00
..
configs [IA64] Manual merge fix for 3 files 2005-09-08 14:27:13 -07:00
dig Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
hp [PATCH] bogus #if (simserial) 2005-09-07 17:17:34 -07:00
ia32 [PATCH] remove duplicated sys_open32() code from 64bit archs 2005-09-07 16:57:43 -07:00
kernel [IA64] Manual merge fix for 3 files 2005-09-08 14:27:13 -07:00
lib [IA64] Manual merge fix for 3 files 2005-09-08 14:27:13 -07:00
mm [IA64] Manual merge fix for 3 files 2005-09-08 14:27:13 -07:00
oprofile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
pci [IA64] Minor cleanups - remove CONFIG_ACPI_DEALLOCATE_IRQ 2005-09-07 14:00:08 -07:00
scripts Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
sn [IA64] Manual merge fix for 3 files 2005-09-08 14:27:13 -07:00
Kconfig [IA64] Manual merge fix for 3 files 2005-09-08 14:27:13 -07:00
Kconfig.debug [PATCH] Kprobes/IA64: arch specific handling 2005-06-23 09:45:22 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
defconfig [IA64] Manual merge fix for 3 files 2005-09-08 14:27:13 -07:00
install.sh Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
module.lds Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00