Merge commit 'v2.6.30-rc3' into tracing/hw-branch-tracing
Ingo Molnar [Fri, 24 Apr 2009 08:11:18 +0000 (10:11 +0200)]
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>

1  2 
arch/x86/include/asm/processor.h
arch/x86/kernel/ptrace.c
include/linux/sched.h
kernel/Makefile
kernel/fork.c
kernel/ptrace.c
kernel/sched.c
kernel/trace/trace.h

Simple merge
@@@ -21,8 -21,6 +21,7 @@@
  #include <linux/audit.h>
  #include <linux/seccomp.h>
  #include <linux/signal.h>
- #include <linux/ftrace.h>
 +#include <linux/workqueue.h>
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
Simple merge
diff --cc kernel/Makefile
Simple merge
diff --cc kernel/fork.c
Simple merge
diff --cc kernel/ptrace.c
Simple merge
diff --cc kernel/sched.c
Simple merge
Simple merge