tree 6d8b0c2e5d33dd0beb9c8c960c5857ed58dfbb37
parent a7bf89a1b14c6ebae233275e704587146fbaa5c1
parent eb019503569c8c701f1e9c70e848d99c6680839b
parent 2c13ce8f6b2f6fd9ba2f9261b1939fc0f62d1307
author Linus Torvalds <torvalds@linux-foundation.org> 1468442687 +0900
committer Linus Torvalds <torvalds@linux-foundation.org> 1468442687 +0900

Merge branches 'perf-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/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