Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2014 05:18:06 +0000 (21:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Dec 2014 05:18:06 +0000 (21:18 -0800)
commitbee2782f30f66898be3f74ad02e4d1f87a969694
treecd175099b587ad14d2e6d5208b9a5781d696dc7c
parent5706ffd045c3810912c4982357d7daa721af3464
parent201e7deb9062bb9a8a5bc113e36457c3ff55b226
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull leftover perf fixes from Ingo Molnar:
 "Two perf fixes left over from the previous cycle"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf session: Do not fail on processing out of order event
  x86/asm/traps: Disable tracing and kprobes in fixup_bad_iret and sync_regs
tools/perf/util/event.h
tools/perf/util/session.c