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)
commitf97d10454e4da2aceb44dfa7c59bb43ba9f50199
tree6d8b0c2e5d33dd0beb9c8c960c5857ed58dfbb37
parenta7bf89a1b14c6ebae233275e704587146fbaa5c1
parenteb019503569c8c701f1e9c70e848d99c6680839b
parent2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307
Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

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