diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-18 11:06:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-18 11:06:05 -0800 |
| commit | 98da295b35cf23222b52a3dc1d768b7997c95a32 (patch) | |
| tree | d12ed0502a7f1a0945e5eed6944c3a046305b0b6 /kernel/time | |
| parent | eb3a3c074624fdae82a09e77740c131f85299d67 (diff) | |
| parent | 512f09801b356c54baef62543e51169f03b2e642 (diff) | |
Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull SMP hotplug fixes from Thomas Gleixner:
"Two fixlets for cpu hotplug:
- Fix a subtle ordering problem with the dummy timer. This happened
to work before the conversion by chance due to initcall ordering.
- Fix the function comment for __cpuhp_setup_state()"
* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
cpu/hotplug: Clarify description of __cpuhp_setup_state() return value
clocksource/dummy_timer: Move hotplug callback after the real timers
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions