Merge branch 'linus' into perf/core, to refresh the branch
authorIngo Molnar <mingo@kernel.org>
Wed, 8 Jun 2016 07:26:46 +0000 (09:26 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 8 Jun 2016 07:26:46 +0000 (09:26 +0200)
commit616d1c1b98ac79f30216a57a170dd7cea19b3df3
tree6f244c2e5a7160190e73bc82b4cd7fa7bb22ee31
parenta4f144ebbdf6f7807c477bce8e136047ed27321f
parentc8ae067f2635be0f8c7e5db1bb74b757d623e05b
Merge branch 'linus' into perf/core, to refresh the branch

Signed-off-by: Ingo Molnar <mingo@kernel.org>
include/linux/perf_event.h
kernel/bpf/stackmap.c
kernel/events/core.c
tools/perf/util/evsel.c
tools/perf/util/parse-events.c
tools/perf/util/session.c