]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'perf-urgent-for-linus', 'smp-urgent-for-linus' and 'timers-urgent...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Apr 2016 18:45:52 +0000 (11:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Apr 2016 18:45:52 +0000 (11:45 -0700)
commit60ee40a87a87d15871180cc529fef784e280db1d
treef81d9203a83dfedae8aeeabff03ab955684f44d7
parente4732db9ea69526972de6b89a7139f6b90a0590e
parent1dcbbe28d21d0355e8adf9b2dfc8015b0323a6a2
parent354a9025185a3c539ef2cf52c434d7893ce4ffe8
parent9322c06a0b78f9964eeed65c3882514e5e898433
Merge branches 'perf-urgent-for-linus', 'smp-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf, cpu hotplug and timer fixes from Ingo Molnar:
 "perf:
   - A single tooling fix for a user-triggerable segfault.

  CPU hotplug:
   - Fix a CPU hotplug corner case regression, introduced by the recent
     hotplug rework

  timers:
   - Fix a boot hang in the ARM based Tango SoC clocksource driver"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf intel-pt: Fix segfault tracing transactions

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Fix rollback during error-out in __cpu_disable()

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/tango-xtal: Fix boot hang due to incorrect test