diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 11:22:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-18 11:22:53 -0500 |
| commit | 186844b292140d1e33225ec95039b6adb03d3fec (patch) | |
| tree | 23665f4d03bd7fea44a1cbe2c8eec7e518ffbafd /tools/perf/util/annotate.c | |
| parent | 62d228b8c676232eca579f91cc0782b060a59097 (diff) | |
| parent | a8e0108cac181a7b141dacaa99ea52efaf9b5f07 (diff) | |
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/util/annotate.c')
0 files changed, 0 insertions, 0 deletions