]> 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)
commit87bbfe6fc9e1e72a4e577b5f6912abc5aa8a948e
treea80672ee82fcc3d9c8d486e53731eb19cd968eb0
parent3ebfa8ad597c55ff7656f303e2c1ec2f842ab9fa
parent459ce5742371391c62dbab6c7c9603c8f569a30a
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