Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 29 Aug 2013 10:02:08 +0000 (12:02 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 29 Aug 2013 10:02:08 +0000 (12:02 +0200)
Pick up the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/x86/kernel/cpu/perf_event_intel_uncore.c
include/linux/sched.h
kernel/sched/core.c
kernel/sched/fair.c

Simple merge
Simple merge
Simple merge