From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Aug 2014 23:16:55 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~3342
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=44744bb344abe032b387d361209038d2956e8c75;p=firefly-linux-kernel-4.4.55.git

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

Pull perf fixes from Ingo Molnar:
 "A kprobes and a perf compat ioctl fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Handle compat ioctl
  kprobes: Skip kretprobe hit in NMI context to avoid deadlock
---

44744bb344abe032b387d361209038d2956e8c75