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

..

bitop.c

Linux-2.6.12-rc2

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

carta_random.S

Linux-2.6.12-rc2

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

checksum.c

Linux-2.6.12-rc2

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

clear_page.S

Linux-2.6.12-rc2

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

clear_user.S

Linux-2.6.12-rc2

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

copy_page_mck.S

Linux-2.6.12-rc2

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

copy_page.S

Linux-2.6.12-rc2

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

copy_user.S

Linux-2.6.12-rc2

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

csum_partial_copy.c

Linux-2.6.12-rc2

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

dec_and_lock.c

Linux-2.6.12-rc2

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

do_csum.S

Linux-2.6.12-rc2

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

flush.S

[PATCH] Kprobes: prevent possible race conditions ia64 changes

2005-09-07 16:58:00 -07:00

idiv32.S

Linux-2.6.12-rc2

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

idiv64.S

Linux-2.6.12-rc2

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

io.c

Linux-2.6.12-rc2

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

ip_fast_csum.S

Linux-2.6.12-rc2

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

Makefile

[IA64] Delete erroneous copy_page.o in global lib-y list

2005-08-26 16:01:25 -07:00

memcpy_mck.S

[IA64] make exception handler in copy_user more robust

2005-09-07 08:53:16 -07:00

memcpy.S

Linux-2.6.12-rc2

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

memset.S

[IA64] fix typos caught by new assembler

2005-05-03 10:56:42 -07:00

strlen_user.S

Linux-2.6.12-rc2

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

strlen.S

Linux-2.6.12-rc2

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

strncpy_from_user.S

Linux-2.6.12-rc2

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

strnlen_user.S

Linux-2.6.12-rc2

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

swiotlb.c

[IA64, X86_64] fix swiotlb sizing

2005-08-18 16:33:28 -07:00

xor.S

Linux-2.6.12-rc2

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