aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/events/perf_event.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2016-12-11 13:05:59 +0100
committerIngo Molnar <mingo@kernel.org>2016-12-11 13:05:59 +0100
commit6de75a37b8e82e3e6bbc773c1fbc7df8338efb90 (patch)
treec2dcd32fbc0e404367c77116412ca526a3b03ce0 /arch/x86/events/perf_event.h
parentMerge tag 'perf-core-for-mingo-20161207' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (diff)
parentMerge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff)
downloadlinux-dev-6de75a37b8e82e3e6bbc773c1fbc7df8338efb90.tar.xz
linux-dev-6de75a37b8e82e3e6bbc773c1fbc7df8338efb90.zip
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions