diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-01 15:44:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-01 15:44:18 -0700 |
| commit | 6ac15baacb6ecd87c66209627753b96ded3b4515 (patch) | |
| tree | a2f2b1b1f23a9d37fdfd3bb52e65c0ba7f0f74d0 /init/main.c | |
| parent | d5fb82137b6cd39e67c4321f4f5ce9b03d4d04e6 (diff) | |
| parent | 65f26062cd8f653dac11d3c00d326f7f57b5e098 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Thomas Gleixner:
"This contains:
- a build regression fix introduced by the timeconst move
- a hotplug regression fix introduced by the timer wheel diet
- a cpu hotplug bug fix for the exynos clocksource driver"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
time: Remove development rules from Kbuild/Makefile
timer: Fix hotplug regression
clocksource: exynos_mct: Avoid blocking calls in the cpu hotplug notifier
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions