Skip to content
GitLab
Commit 344a0761 authored by Tony Luck's avatar Tony Luck
Browse files

[IA64] Manual merge fix for 3 files 



	arch/ia64/Kconfig
	arch/ia64/kernel/acpi.c
	include/asm-ia64/irq.h

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parents 9b17e7e7 1b11d78c
Expand all Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment