tree e5b4eec5a313c9ee9b7b0f22ce3ba77970ea17e0
parent 959dc2587d69f77af9de63199bd2dc468a736595
parent b3f207855f57b9c8f43a547a801340bb5cbc59e5
author Linus Torvalds <torvalds@linux-foundation.org> 1408922215 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1408922215 -0700

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/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