projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 959dc25 b3f2078)
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Aug 2014 23:16:55 +0000 (16:16 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 24 Aug 2014 23:16:55 +0000 (16:16 -0700)
commit44744bb344abe032b387d361209038d2956e8c75
treee5b4eec5a313c9ee9b7b0f22ce3ba77970ea17e0tree | snapshot
parent959dc2587d69f77af9de63199bd2dc468a736595commit | diff
parentb3f207855f57b9c8f43a547a801340bb5cbc59e5commit | diff
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
Linux Project Source (from git://github.com/torvalds/linux)