Merge branch 'linus' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-03-16 09:50:50 +01:00
parent ffa86c2f1a 69eea5a4ab
commit 2b95bd7d58
586 changed files with 7758 additions and 3473 deletions
@@ -1001,7 +1001,7 @@ list_update_cgroup_event(struct perf_event *event,
 */
 #define PERF_CPU_HRTIMER (1000 / HZ)
 /*
- * function must be called with interrupts disbled
+ * function must be called with interrupts disabled
 */
 static enum hrtimer_restart perf_mux_hrtimer_handler(struct hrtimer *hr)
 {