[IA64] Manual merge fix for 3 files
[linux-2.6.git] / arch / ia64 / configs / zx1_defconfig
2005-09-08 Tony Luck [IA64] Manual merge fix for 3 files
2005-09-07 Kenji Kaneshige [IA64] Minor cleanups - remove CONFIG_ACPI_DEALLOCATE_IRQ
2005-08-25 Len Brown [ACPI] delete CONFIG_ACPI_PCI
2005-08-25 Len Brown [ACPI] IA64-related ACPI Kconfig fixes
2005-08-24 Len Brown [ACPI] delete CONFIG_ACPI_BUS
2005-08-24 Len Brown [ACPI] delete CONFIG_ACPI_INTERPRETER
2005-08-24 Len Brown [ACPI] delete CONFIG_ACPI_BOOT
2005-08-17 Peter Chubb [IA64] Updated zx1 defconfig
2005-06-29 Tony Luck [IA64] Update zx1_defconfig
2005-04-16 Linus Torvalds Linux-2.6.12-rc2