Merge branch 'linus' into tracing/ftrace

diff --cc Makefile
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Kconfig.debug
Simple merge

diff --cc arch/x86/kernel/entry_32.S
Simple merge

diff --cc arch/x86/kernel/process_32.c
Simple merge

diff --cc arch/x86/kernel/process_64.c
Simple merge

diff --cc arch/x86/mm/fault.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/vdso/vclock_gettime.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
index b8c9fe676221196df272b8b2ade3635e2ab8a577,eaf6751e7612cbc5167865c8c1e4e929ff32ca5a..96fbbbf3722c59fa534ce289053863b3012c3a4a
--- 1/kernel/sched.c
--- 2/kernel/sched.c
+++ b/kernel/sched.c
@@@ -2631,11 -2275,8 +2297,11 @@@ void wake_up_new_task(struct task_struc
                 * management (if any):
                 */
                p->sched_class->task_new(rq, p);
-               inc_nr_running(rq);
+               inc_nr_running(p, rq);
        }
 +      trace_mark(kernel_sched_wakeup_new,
 +              "pid %d state %ld ## rq %p task %p rq->curr %p",
 +              p->pid, p->state, rq, p, rq->curr);
        check_preempt_curr(rq, p);
  #ifdef CONFIG_SMP
        if (p->sched_class->task_wake_up)