| commit | 344a076110f4ecb16ea6d286b63be696604982ed | [log] [tgz] |
|---|---|---|
| author | Tony Luck <tony.luck@intel.com> | Thu Sep 08 14:27:13 2005 -0700 |
| committer | Tony Luck <tony.luck@intel.com> | Thu Sep 08 14:27:13 2005 -0700 |
| tree | def6e229efdb6ee91b631b6695bf7f9ace8e2719 | |
| parent | 9b17e7e74e767d8a494a74c3c459aeecd1e08c5f [diff] | |
| parent | 1b11d78cf87a7014f96e5b7fa2e1233cc8081a00 [diff] |
[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>