summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 06:18:06 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 06:18:06 +0100
commitbee2782f30f66898be3f74ad02e4d1f87a969694 (patch)
treecd175099b587ad14d2e6d5208b9a5781d696dc7c /kernel
parentMerge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff)
parentMerge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-bee2782f30f66898be3f74ad02e4d1f87a969694.tar.xz
linux-bee2782f30f66898be3f74ad02e4d1f87a969694.zip
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions