diff options
author | Linus Torvalds | 2013-09-18 18:22:53 +0200 |
---|---|---|
committer | Linus Torvalds | 2013-09-18 18:22:53 +0200 |
commit | 186844b292140d1e33225ec95039b6adb03d3fec (patch) | |
tree | 23665f4d03bd7fea44a1cbe2c8eec7e518ffbafd /tools/perf/builtin-trace.c | |
parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/virt/kvm/kvm (diff) | |
parent | perf: Fix UAPI export of PERF_EVENT_IOC_ID (diff) | |
download | kernel-qcow2-linux-186844b292140d1e33225ec95039b6adb03d3fec.tar.gz kernel-qcow2-linux-186844b292140d1e33225ec95039b6adb03d3fec.tar.xz kernel-qcow2-linux-186844b292140d1e33225ec95039b6adb03d3fec.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Two small fixes"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Fix UAPI export of PERF_EVENT_IOC_ID
perf/x86/intel: Fix Silvermont offcore masks
Diffstat (limited to 'tools/perf/builtin-trace.c')
0 files changed, 0 insertions, 0 deletions