]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2b777a2 d001361)
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)
commitd110e1ebd51eb99a3168d205e1a51bc0d83a9dab
treee5b4eec5a313c9ee9b7b0f22ce3ba77970ea17e0tree | snapshot
parent2b777a24f20d38f49dcc6422191769469593065fcommit | diff
parentd0013610e36ea9fabde3a8fd5e340c8cfca8e808commit | diff
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
Linux Kernel Source Tree.