diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 20:45:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-23 20:45:52 +0200 |
| commit | 82b23cb94b8cee25781c209d9b1df3b144c8bb5f (patch) | |
| tree | f81d9203a83dfedae8aeeabff03ab955684f44d7 /drivers/clocksource | |
| parent | Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux... (diff) | |
| parent | Merge tag 'perf-urgent-for-mingo-20160418' of git://git.kernel.org/pub/scm/li... (diff) | |
| parent | cpu/hotplug: Fix rollback during error-out in __cpu_disable() (diff) | |
| parent | clocksource/drivers/tango-xtal: Fix boot hang due to incorrect test (diff) | |
| download | linux-82b23cb94b8cee25781c209d9b1df3b144c8bb5f.tar.xz linux-82b23cb94b8cee25781c209d9b1df3b144c8bb5f.zip | |
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