original_kernel/arch/x86/lib
Ingo Molnar 1a781a777b Merge branch 'generic-ipi' into generic-ipi-for-linus
Conflicts:

	arch/powerpc/Kconfig
	arch/s390/kernel/time.c
	arch/x86/kernel/apic_32.c
	arch/x86/kernel/cpu/perfctr-watchdog.c
	arch/x86/kernel/i8259_64.c
	arch/x86/kernel/ldt.c
	arch/x86/kernel/nmi_64.c
	arch/x86/kernel/smpboot.c
	arch/x86/xen/smp.c
	include/asm-x86/hw_irq_32.h
	include/asm-x86/hw_irq_64.h
	include/asm-x86/mach-default/irq_vectors.h
	include/asm-x86/mach-voyager/irq_vectors.h
	include/asm-x86/smp.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2008-07-15 21:55:59 +02:00
..
Makefile Merge branch 'auto-ftrace-next' into tracing/for-linus 2008-07-14 16:11:52 +02:00
checksum_32.S
clear_page_64.S
copy_page_64.S
copy_user_64.S x86: fix compile error in current tip.git 2008-07-10 21:55:59 +02:00
copy_user_nocache_64.S x86: fix compile error in current tip.git 2008-07-10 21:55:59 +02:00
csum-copy_64.S
csum-partial_64.c
csum-wrappers_64.c
delay.c x86: integrate delay functions. 2008-07-09 08:52:05 +02:00
getuser.S x86: merge getuser asm functions. 2008-07-09 09:14:05 +02:00
io_64.c
iomap_copy_64.S
memcpy_32.c
memcpy_64.S
memmove_64.c
memset_64.S
mmx_32.c
msr-on-cpu.c smp_call_function: get rid of the unused nonatomic/retry argument 2008-06-26 11:24:35 +02:00
putuser.S x86: merge putuser asm functions. 2008-07-09 09:14:13 +02:00
rwlock_64.S
semaphore_32.S
string_32.c
strstr_32.c
thunk_32.S
thunk_64.S
usercopy_32.c
usercopy_64.c x86: introduce copy_user_handle_tail() routine 2008-07-09 15:51:03 +02:00