summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-09 21:18:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-09 21:18:06 -0800
commitbee2782f30f66898be3f74ad02e4d1f87a969694 (patch)
treecd175099b587ad14d2e6d5208b9a5781d696dc7c /include/asm-generic
parent5706ffd045c3810912c4982357d7daa721af3464 (diff)
parent201e7deb9062bb9a8a5bc113e36457c3ff55b226 (diff)
downloadlinux-bee2782f30f66898be3f74ad02e4d1f87a969694.tar.bz2
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 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions