| commit | 5806b81ac1c0c52665b91723fd4146a4f86e386b | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Mon Jul 14 16:11:52 2008 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Mon Jul 14 16:11:52 2008 +0200 |
| tree | 24ea8763bf308ce1407c1de91dc8de4d2655e1c1 | |
| parent | d14c8a680ccfdeb5e7b9be4d61162c2b373bd1e8 [diff] | |
| parent | 6712e299b7dc78aa4971b85e803435ee6d49a9dd [diff] |
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>