Merge branch 'linus' into timers/core
authorThomas Gleixner <tglx@linutronix.de>
Tue, 19 May 2015 14:12:32 +0000 (16:12 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 19 May 2015 14:12:32 +0000 (16:12 +0200)
commitc3b5d3cea508d2c8ff493ef18c45a9cc58fb7015
treea80672ee82fcc3d9c8d486e53731eb19cd968eb0
parentdaa67b4b70568a07fef3cffacb2055891bf42ddb
parente26081808edadfd257c6c9d81014e3b25e9a6118
Merge branch 'linus' into timers/core

Make sure the upstream fixes are applied before adding further
modifications.
arch/x86/kernel/cpu/perf_event_intel_rapl.c
include/linux/clocksource.h
kernel/events/core.c
kernel/locking/rtmutex.c
kernel/sched/core.c