]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitb1650ac03a670a1d46727fd39256237ae5bf1fca
treecd175099b587ad14d2e6d5208b9a5781d696dc7c
parentea2e60a83645f2a37bb41d21c6d0cf70f2672ff1
parentfb47dd1d4805f71cdd6428e0677bbe864f036b18
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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