bb3c3e8071
Conflicts: kernel/trace/trace_event_profile.c Merge reason: update to -rc5 and resolve conflict. Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
|---|---|---|
| .. | ||
| atomic64_32.c | ||
| checksum_32.S | ||
| clear_page_64.S | ||
| cmpxchg8b_emu.S | ||
| copy_page_64.S | ||
| copy_user_64.S | ||
| copy_user_nocache_64.S | ||
| csum-copy_64.S | ||
| csum-partial_64.c | ||
| csum-wrappers_64.c | ||
| delay.c | ||
| getuser.S | ||
| inat.c | ||
| insn.c | ||
| io_64.c | ||
| iomap_copy_64.S | ||
| Makefile | ||
| memcpy_32.c | ||
| memcpy_64.S | ||
| memmove_64.c | ||
| memset_64.S | ||
| mmx_32.c | ||
| msr-reg-export.c | ||
| msr-reg.S | ||
| msr.c | ||
| putuser.S | ||
| 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-opcode-map.txt | ||