Ingo Molnar 5806b81ac1 Merge branch 'auto-ftrace-next' into tracing/for-linus ...

Conflicts:

	arch/x86/kernel/entry_32.S
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c
	arch/x86/lib/Makefile
	include/asm-x86/irqflags.h
	kernel/Makefile
	kernel/sched.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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

x86: fix csum_partial() export

2008-05-13 19:38:47 +02:00

csum-wrappers_64.c

x86: clean up csum-wrappers_64.c some more

2008-02-19 16:18:32 +01:00

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

x86: coding style fixes in arch/x86/lib/io_64.c

2008-02-19 16:18:32 +01:00

iomap_copy_64.S

…

Makefile

Merge branch 'auto-ftrace-next' into tracing/for-linus

2008-07-14 16:11:52 +02:00

memcpy_32.c

x86: coding style fixes to arch/x86/lib/memcpy_32.c

2008-04-17 17:40:49 +02:00

memcpy_64.S

…

memmove_64.c

x86: coding style fixes to arch/x86/lib/memmove_64.c

2008-04-17 17:40:48 +02:00

memset_64.S

…

mmx_32.c

x86: clean up mmx_32.c

2008-04-17 17:40:47 +02:00

msr-on-cpu.c

i386: simplify smp_call_function_single() call sequence in msr-on-cpu

2007-10-17 20:16:20 +02:00

putuser.S

x86: merge putuser asm functions.

2008-07-09 09:14:13 +02:00

rwlock_64.S

x86: rename .i assembler includes to .h

2007-10-17 20:16:29 +02:00

semaphore_32.S

Generic semaphore implementation

2008-04-17 10:42:34 -04:00

string_32.c

x86: coding style fixes to arch/x86/lib/string_32.c

2008-04-17 17:40:48 +02:00

strstr_32.c

x86: coding style fixes to arch/x86/lib/strstr_3

2008-04-17 17:40:49 +02:00

thunk_32.S

ftrace: trace irq disabled critical timings

2008-05-23 20:32:46 +02:00

thunk_64.S

ftrace: trace irq disabled critical timings

2008-05-23 20:32:46 +02:00

usercopy_32.c

x86: coding style fixes to arch/x86/lib/usercopy_32.c

2008-04-17 17:40:51 +02:00

usercopy_64.c

x86: introduce copy_user_handle_tail() routine

2008-07-09 15:51:03 +02:00