Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Sep 2013 16:22:53 +0000 (11:22 -0500)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 18 Sep 2013 16:22:53 +0000 (11:22 -0500)
commit9783424022b651058981fd450109413f5445545e
tree23665f4d03bd7fea44a1cbe2c8eec7e518ffbafd
parentea0820c2784da155dadc09c3f1baf4b32d6421da
parentf4c11977ab97653da0f3dd38c715cbc86ec4a76a
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