projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a7bf89a eb01950 2c13ce8)
Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jul 2016 20:44:47 +0000 (05:44 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Jul 2016 20:44:47 +0000 (05:44 +0900)
Pull perf and timer fixes from Ingo Molnar:
 "A fix for a posix CPU timers bug, and a perf printk message fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Fix bogus kernel printk, again

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  posix_cpu_timer: Exit early when process has been reaped


Trivial merge