]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitf6dc58afd5a231dfc5f1cd715bf3fd2894774c6a
treea80672ee82fcc3d9c8d486e53731eb19cd968eb0
parent419669f6f38b6eb74082fec084df4be1ef0f02d7
parent487f8369a912c26a52c8d6d80522bda1571046b7
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