tree dc59593663b2c34f84444926ccf0cb93c81149e3
parent 0eda4020ae53cc057a04ccc802a67f2a5336f8ef
parent cf30d52e2d11523c42048ab89ed4215b5021526a
author Linus Torvalds <torvalds@linux-foundation.org> 1387312505 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1387312505 -0800

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

Pull perf fix from Ingo Molnar:
 "An x86/intel event constraint fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix constraint table end marker bug