projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 56449f4 0910697)
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
authorIngo Molnar <mingo@elte.hu>
Fri, 24 Apr 2009 08:11:18 +0000 (10:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 24 Apr 2009 08:11:23 +0000 (10:11 +0200)
commit416dfdcdb894432547ead4fcb9fa6a36b396059e
tree8033fdda07397a59c5fa98c88927040906ce6c1atree | snapshot (tar.gz zip)
parent56449f437add737a1e5e1cb7e00f63ac8ead1938commit | diff
parent091069740304c979f957ceacec39c461d0192158commit | diff
Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing

Conflicts:
arch/x86/kernel/ptrace.c

Merge reason: fix the conflict above, and also pick up the CONFIG_BROKEN
              dependency change from upstream so that we can remove it
      here.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/processor.h diff1 | diff2 | blob | history
arch/x86/kernel/ptrace.c diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
kernel/Makefile diff1 | diff2 | blob | history
kernel/fork.c diff1 | diff2 | blob | history
kernel/ptrace.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
kernel/trace/trace.h diff1 | diff2 | blob | history