git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d14c8a6
6712e29
)
Merge branch 'auto-ftrace-next' into tracing/for-linus
author
Ingo Molnar
<mingo@elte.hu>
Mon, 14 Jul 2008 14:11:52 +0000
(16:11 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Mon, 14 Jul 2008 14:11:52 +0000
(16:11 +0200)
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>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff