From: Tony Luck <tony.luck@intel.com>
Date: Thu, 8 Sep 2005 21:27:13 +0000 (-0700)
Subject: [IA64] Manual merge fix for 3 files
X-Git-Tag: v2.6.14-rc1~492^2~15^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=344a076110f4ecb16ea6d286b63be696604982ed;p=pandora-kernel.git

[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>
---

344a076110f4ecb16ea6d286b63be696604982ed
Reading git-diff-tree failed