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

..

bigsur_defconfig

[ACPI] delete CONFIG_ACPI_PCI

2005-08-25 12:40:44 -04:00

sim_defconfig

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

sn2_defconfig

[IA64] Manual merge fix for 3 files

2005-09-08 14:27:13 -07:00

tiger_defconfig

[IA64] Manual merge fix for 3 files

2005-09-08 14:27:13 -07:00

zx1_defconfig

[IA64] Manual merge fix for 3 files

2005-09-08 14:27:13 -07:00