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)
commitaee2bce3cfdcb9bf2c51c24496ee776e8202ed11
tree66ff8e345cf693cfb39383f25ad796e2f59ab6ad
parent5ec4c599a52362896c3e7c6a31ba6145dca9c6f5
parentc95389b4cd6a4b52af78bea706a274453e886251
Merge branch 'linus' into perf/core

Pick up the latest upstream fixes.

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