tree 23665f4d03bd7fea44a1cbe2c8eec7e518ffbafd
parent 62d228b8c676232eca579f91cc0782b060a59097
parent a8e0108cac181a7b141dacaa99ea52efaf9b5f07
author Linus Torvalds <torvalds@linux-foundation.org> 1379521373 -0500
committer Linus Torvalds <torvalds@linux-foundation.org> 1379521373 -0500

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