Merge branch 'timers/core' into sched/idle
Avoid heavy conflicts caused by WIP patches in drivers/cpuidle/cpuidle.c,
by merging these into a single base.
Signed-off-by: 
Ingo Molnar <mingo@kernel.org>
No related branches found
No related tags found
Showing
- drivers/cpuidle/cpuidle.c 8 additions, 6 deletionsdrivers/cpuidle/cpuidle.c
- include/linux/clockchips.h 13 additions, 3 deletionsinclude/linux/clockchips.h
- kernel/time/Kconfig 1 addition, 1 deletionkernel/time/Kconfig
- kernel/time/Makefile 4 additions, 1 deletionkernel/time/Makefile
- kernel/time/clockevents.c 30 additions, 10 deletionskernel/time/clockevents.c
- kernel/time/ntp.c 3 additions, 2 deletionskernel/time/ntp.c
- kernel/time/tick-broadcast-hrtimer.c 106 additions, 0 deletionskernel/time/tick-broadcast-hrtimer.c
- kernel/time/tick-broadcast.c 74 additions, 11 deletionskernel/time/tick-broadcast.c
- kernel/time/tick-internal.h 8 additions, 3 deletionskernel/time/tick-internal.h
- kernel/timer.c 36 additions, 3 deletionskernel/timer.c
Loading
Please register or sign in to comment