tree 78ddc81f1fc1cb83e4efc65b8d5fbfbce7b8f0be
parent 12c71c4b601923a9cc28918e944ec1e8c65ddac9
parent f1923820c447e986a9da0fc6bf60c1dccdf0408e
author Linus Torvalds <torvalds@linux-foundation.org> 1366565142 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1366565142 -0700

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "Misc fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix offcore_rsp valid mask for SNB/IVB
  perf: Treat attr.config as u64 in perf_swevent_init()