]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8f2086 a213694)
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)
commit5eda71e792a1388d1c8eb1d8a6b8ce7d0853ed44
treee5b4eec5a313c9ee9b7b0f22ce3ba77970ea17e0tree | snapshot
parente8f208639c2f4fe941fd3276105f8d25c4bc110bcommit | diff
parenta213694602f3fbb8e250817cd109cb126c38e0b4commit | 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.