Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
authorIngo Molnar <mingo@kernel.org>
Mon, 28 Sep 2015 06:06:57 +0000 (08:06 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 28 Sep 2015 06:06:57 +0000 (08:06 +0200)
commit6afc0c269c3d20cde05515b00ede00e91fee0be5
treed54e7fa59df16bb62902129dfd28956d9ae1be19
parent968d712a2565121b269e1037a1517916a9769423
parent097f70b3c4d84ffccca15195bdfde3a37c0a7c0f
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/s390/kernel/perf_cpum_cf.c
tools/perf/util/probe-event.c