Merge branch 'linus' into perf/core, to pick up fixes before merging new changes
authorIngo Molnar <mingo@kernel.org>
Tue, 14 Jun 2016 09:14:34 +0000 (11:14 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 14 Jun 2016 09:14:34 +0000 (11:14 +0200)
commit3559ff9650224a4af6b777a5df786f521f66db5a
treeff1d9ec0e27ab4b452f1d8b12485d21102900597
parent70e0d117f2502f19517be03a64b3c513f31b3cdb
parentdb06d759d6cf903aeda8c107fd3abd366dd80200
Merge branch 'linus' into perf/core, to pick up fixes before merging new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/uncore_snbep.c
kernel/events/core.c